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

*Refactored the initial raytracer so it doesn't use the Parent reference. 

*Fixed a 'statement out of order' error in the setting of the permissions that are sent to the client.
afrisby
Teravus Ovares 2007-11-30 16:29:23 +00:00
parent d2fe290bb6
commit 95c68a316a
3 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -300,7 +300,7 @@ namespace OpenSim.Region.Environment.Scenes
if (ent is SceneObjectGroup) if (ent is SceneObjectGroup)
{ {
SceneObjectGroup reportingG = (SceneObjectGroup)ent; SceneObjectGroup reportingG = (SceneObjectGroup)ent;
EntityIntersection result = reportingG.testIntersection(hray); EntityIntersection result = reportingG.TestIntersection(hray);
if (result.HitTF) if (result.HitTF)
{ {
if (result.distance < closestDistance) if (result.distance < closestDistance)

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

@ -358,17 +358,27 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public EntityIntersection testIntersection(Ray hRay) public EntityIntersection TestIntersection(Ray hRay)
{ {
// We got a request from the inner_scene to raytrace along the Ray hRay
// We're going to check all of the prim in this group for intersection with the ray
// If we get a result, we're going to find the closest result to the origin of the ray
// and send back the intersection information back to the innerscene.
EntityIntersection returnresult = new EntityIntersection(); EntityIntersection returnresult = new EntityIntersection();
bool gothit = false;
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
SceneObjectPart returnThisPart = null;
Vector3 partPosition = new Vector3(part.AbsolutePosition.X,part.AbsolutePosition.Y,part.AbsolutePosition.Z); Vector3 partPosition = new Vector3(part.AbsolutePosition.X,part.AbsolutePosition.Y,part.AbsolutePosition.Z);
Quaternion parentrotation = new Quaternion(GroupRotation.W,GroupRotation.X,GroupRotation.Y,GroupRotation.Z); Quaternion parentrotation = new Quaternion(GroupRotation.W,GroupRotation.X,GroupRotation.Y,GroupRotation.Z);
EntityIntersection inter = part.testIntersection(hRay,parentrotation);
// Telling the prim to raytrace.
EntityIntersection inter = part.TestIntersection(hRay,parentrotation);
// This may need to be updated to the maximum draw distance possible..
// We might (and probably will) be checking for prim creation from other sims
// when the camera crosses the border.
float idist = 256f; float idist = 256f;
@ -384,7 +394,6 @@ namespace OpenSim.Region.Environment.Scenes
returnresult.obj = part; returnresult.obj = part;
returnresult.normal = inter.normal; returnresult.normal = inter.normal;
returnresult.distance = inter.distance; returnresult.distance = inter.distance;
gothit = true;
} }
} }

50
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -561,10 +561,12 @@ namespace OpenSim.Region.Environment.Scenes
serializer.Serialize(xmlWriter, this); serializer.Serialize(xmlWriter, this);
} }
public EntityIntersection testIntersection(Ray iray, Quaternion parentrot) public EntityIntersection TestIntersection(Ray iray, Quaternion parentrot)
{ {
//Sphere dummysphere = new Sphere(); // In this case we're using a sphere with a radius of the largest dimention of the prim
// TODO: Change to take shape into account
EntityIntersection returnresult = new EntityIntersection(); EntityIntersection returnresult = new EntityIntersection();
Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
@ -582,23 +584,25 @@ namespace OpenSim.Region.Environment.Scenes
Vector3 rDirection = iray.Direction; Vector3 rDirection = iray.Direction;
// Buidling the first part of the Quadratic equation
Vector3 r2ndDirection = rDirection * rDirection; Vector3 r2ndDirection = rDirection * rDirection;
float itestPart1 = r2ndDirection.x + r2ndDirection.y + r2ndDirection.z; float itestPart1 = r2ndDirection.x + r2ndDirection.y + r2ndDirection.z;
// Buidling the second part of the Quadratic equation
Vector3 tmVal2 = rOrigin - vAbsolutePosition; Vector3 tmVal2 = rOrigin - vAbsolutePosition;
Vector3 r2Direction = rDirection * 2.0f; Vector3 r2Direction = rDirection * 2.0f;
Vector3 tmVal3 = r2Direction * tmVal2; Vector3 tmVal3 = r2Direction * tmVal2;
float itestPart2 = tmVal3.x + tmVal3.y + tmVal3.z; float itestPart2 = tmVal3.x + tmVal3.y + tmVal3.z;
// Buidling the third part of the Quadratic equation
Vector3 tmVal4 = rOrigin * rOrigin; Vector3 tmVal4 = rOrigin * rOrigin;
Vector3 tmVal5 = vAbsolutePosition * vAbsolutePosition; Vector3 tmVal5 = vAbsolutePosition * vAbsolutePosition;
Vector3 tmVal6 = vAbsolutePosition * rOrigin; Vector3 tmVal6 = vAbsolutePosition * rOrigin;
// Set Radius to the largest dimention of the prim
float radius = 0f; float radius = 0f;
if (vScale.x > radius) if (vScale.x > radius)
radius = vScale.x; radius = vScale.x;
@ -611,11 +615,11 @@ namespace OpenSim.Region.Environment.Scenes
float itestPart3 = tmVal4.x + tmVal4.y + tmVal4.z + tmVal5.x + tmVal5.y + tmVal5.z -(2.0f * (tmVal6.x + tmVal6.y + tmVal6.z + (radius * radius))); float itestPart3 = tmVal4.x + tmVal4.y + tmVal4.z + tmVal5.x + tmVal5.y + tmVal5.z -(2.0f * (tmVal6.x + tmVal6.y + tmVal6.z + (radius * radius)));
// Yuk Quadradrics // Yuk Quadradrics.. Solve first
float rootsqr = (itestPart2 * itestPart2) - (4.0f * itestPart1 * itestPart3); float rootsqr = (itestPart2 * itestPart2) - (4.0f * itestPart1 * itestPart3);
if (rootsqr < 0.0f) if (rootsqr < 0.0f)
{ {
// No intersection
return returnresult; return returnresult;
} }
float root = ((-itestPart2) - (float)Math.Sqrt((double)rootsqr)) / (itestPart1 * 2.0f); float root = ((-itestPart2) - (float)Math.Sqrt((double)rootsqr)) / (itestPart1 * 2.0f);
@ -628,18 +632,30 @@ namespace OpenSim.Region.Environment.Scenes
// is there any intersection? // is there any intersection?
if (root < 0.0f) if (root < 0.0f)
{ {
// nope, no intersection
return returnresult; return returnresult;
} }
} }
// We got an intersection. putting together an EntityIntersection object with the
// intersection information
Vector3 ipoint = new Vector3(iray.Origin.x + (iray.Direction.x * root),iray.Origin.y + (iray.Direction.y * root),iray.Origin.z + (iray.Direction.z * root)); Vector3 ipoint = new Vector3(iray.Origin.x + (iray.Direction.x * root),iray.Origin.y + (iray.Direction.y * root),iray.Origin.z + (iray.Direction.z * root));
returnresult.HitTF = true; returnresult.HitTF = true;
returnresult.ipoint = ipoint; returnresult.ipoint = ipoint;
// Normal is calculated by the difference and then normalizing the result
Vector3 normalpart = ipoint-vAbsolutePosition; Vector3 normalpart = ipoint-vAbsolutePosition;
returnresult.normal = normalpart.Normalize(); returnresult.normal = normalpart.Normalize();
returnresult.distance = ParentGroup.m_scene.m_innerScene.Vector3Distance(iray.Origin, ipoint);
// It's funny how the LLVector3 object has a Distance function, but the Axiom.Math object doesnt.
// I can write a function to do it.. but I like the fact that this one is Static.
LLVector3 distanceConvert1 = new LLVector3(iray.Origin.x,iray.Origin.y,iray.Origin.z);
LLVector3 distanceConvert2 = new LLVector3(ipoint.x, ipoint.y, ipoint.z);
float distance = (float)distanceConvert1.GetDistanceTo(distanceConvert2);
returnresult.distance = distance;
return returnresult; return returnresult;
} }
@ -1235,15 +1251,15 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
// If you can't edit it, send the base permissions minus the flag to edit // If you can't edit it, send the base permissions minus the flag to edit
// We're going to be moving this into ScenePresence and the PermissionsManager itself.
if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions) if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions)
{ {
if (ParentGroup.m_scene.PermissionsMngr.CanEditObject(remoteClient.AgentId, this.ParentGroup.UUID)) if (ParentGroup.m_scene.PermissionsMngr.CanEditObject(remoteClient.AgentId, this.ParentGroup.UUID))
{ {
//clientFlags = ObjectFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify; // we should be merging the objectflags with the ownermask here.
//clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove; // TODO: Future refactoring here.
//clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
//clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
// Send EveryoneMask
clientFlags = ObjectFlags; clientFlags = ObjectFlags;
} }
@ -1259,13 +1275,13 @@ namespace OpenSim.Region.Environment.Scenes
{ {
clientFlags = clientFlags &= ~(uint) LLObject.ObjectFlags.ObjectMove; clientFlags = clientFlags &= ~(uint) LLObject.ObjectFlags.ObjectMove;
} }
clientFlags = EveryoneMask;
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify; clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify;
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop; clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer; clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
// TODO, FIXME, ERROR : This whole block amounts to moot because of this.
clientFlags = EveryoneMask;
} }
} }