OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Couple of more small changes

afrisby
MW 2007-12-11 18:29:19 +00:00
parent 77841fe35e
commit 60c96ab687
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -845,20 +845,27 @@ namespace OpenSim.Region.Environment.Scenes
if (PermissionsMngr.CanRezObject(ownerID, pos)) if (PermissionsMngr.CanRezObject(ownerID, pos))
{ {
Vector3 CameraPosition = ((ScenePresence)GetScenePresence(ownerID)).CameraPosition;
Vector3 rayEnd = new Vector3(pos.X, pos.Y, pos.Z);
float raydistance = m_innerScene.Vector3Distance(CameraPosition, rayEnd); EntityIntersection rayTracing = null;
ScenePresence presence = ((ScenePresence)GetScenePresence(ownerID));
if (presence != null)
{
Vector3 CameraPosition = presence.CameraPosition;
Vector3 rayEnd = new Vector3(pos.X, pos.Y, pos.Z);
Vector3 rayDirection = new Vector3(rayEnd.x / raydistance, rayEnd.y / raydistance, rayEnd.z / raydistance); float raydistance = m_innerScene.Vector3Distance(CameraPosition, rayEnd);
Ray rezRay = new Ray(CameraPosition, rayDirection); Vector3 rayDirection = new Vector3(rayEnd.x / raydistance, rayEnd.y / raydistance, rayEnd.z / raydistance);
Vector3 RezDirectionFromCamera = rezRay.Direction; Ray rezRay = new Ray(CameraPosition, rayDirection);
EntityIntersection rayTracing = m_innerScene.GetClosestIntersectingPrim(rezRay); Vector3 RezDirectionFromCamera = rezRay.Direction;
if (rayTracing.HitTF) rayTracing = m_innerScene.GetClosestIntersectingPrim(rezRay);
}
if ((rayTracing != null) && ( rayTracing.HitTF))
{ {
// We raytraced and found a prim in the way of the ground.. so // We raytraced and found a prim in the way of the ground.. so
// We will rez the object somewhere close to the prim. Better math needed. This is a Stub // We will rez the object somewhere close to the prim. Better math needed. This is a Stub
@ -918,6 +925,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
PrimitiveBaseShape treeShape = new PrimitiveBaseShape(); PrimitiveBaseShape treeShape = new PrimitiveBaseShape();
treeShape.PathCurve = 16; treeShape.PathCurve = 16;
treeShape.PathEnd = 49900;
treeShape.PCode = newTree ? (byte)libsecondlife.ObjectManager.PCode.NewTree : (byte)libsecondlife.ObjectManager.PCode.Tree; treeShape.PCode = newTree ? (byte)libsecondlife.ObjectManager.PCode.NewTree : (byte)libsecondlife.ObjectManager.PCode.Tree;
treeShape.Scale = scale; treeShape.Scale = scale;
treeShape.State = (byte)treeType; treeShape.State = (byte)treeType;

5
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1316,8 +1316,11 @@ namespace OpenSim.Region.Environment.Scenes
if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
{ {
AbsolutePosition = pos; AbsolutePosition = pos;
ScheduleGroupForTerseUpdate();
} }
//we need to do a terse update even if the move wasn't allowed
// so that the position is reset in the client (the object snaps back)
ScheduleGroupForTerseUpdate();
} }
/// <summary> /// <summary>