ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.

Browse Source 
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-04-03 05:50:13 +01:00
parent 6e7f13a72d
commit 7468299673
6 changed files with 209 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -523,16 +523,21 @@ namespace OpenSim.Region.Framework.Scenes
{
m_isSelected = value;
// Tell physics engine that group is selected
if (m_rootPart.PhysActor != null)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
{
m_rootPart.PhysActor.Selected = value;
pa.Selected = value;
// Pass it on to the children.
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
{
SceneObjectPart child = parts[i];
if (child.PhysActor != null)
child.PhysActor.Selected = value;
PhysicsActor childPa = child.PhysActor;
if (childPa != null)
childPa.Selected = value;
}
}
}
@@ -1478,7 +1483,8 @@ namespace OpenSim.Region.Framework.Scenes
}
// Need to duplicate the physics actor as well
if (part.PhysActor != null && userExposed)
PhysicsActor originalPartPa = part.PhysActor;
if (originalPartPa != null && userExposed)
{
PrimitiveBaseShape pbs = newPart.Shape;
@@ -1489,10 +1495,10 @@ namespace OpenSim.Region.Framework.Scenes
newPart.AbsolutePosition,
newPart.Scale,
newPart.RotationOffset,
part.PhysActor.IsPhysical,
originalPartPa.IsPhysical,
newPart.LocalId);
newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true);
}
}
@@ -1564,45 +1570,53 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
RootPart.PhysActor.AddForce(impulse, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor);
pa.AddForce(impulse, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
}
public void applyAngularImpulse(Vector3 impulse)
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
if (!IsAttachment)
{
RootPart.PhysActor.AddAngularForce(impulse, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor);
pa.AddAngularForce(impulse, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
}
public void setAngularImpulse(Vector3 impulse)
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
if (!IsAttachment)
{
RootPart.PhysActor.Torque = impulse;
m_scene.PhysicsScene.AddPhysicsActorTaint(RootPart.PhysActor);
pa.Torque = impulse;
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
}
public Vector3 GetTorque()
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
if (!IsAttachment)
{
Vector3 torque = RootPart.PhysActor.Torque;
Vector3 torque = pa.Torque;
return torque;
}
}
@@ -1622,19 +1636,23 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
RootPart.PhysActor.PIDTarget = target;
RootPart.PhysActor.PIDTau = tau;
RootPart.PhysActor.PIDActive = true;
pa.PIDTarget = target;
pa.PIDTau = tau;
pa.PIDActive = true;
}
}
}
public void stopMoveToTarget()
{
if (RootPart.PhysActor != null)
RootPart.PhysActor.PIDActive = false;
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
pa.PIDActive = false;
}
/// <summary>
@@ -1645,18 +1663,20 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="tau">Number of seconds over which to reach target</param>
public void SetHoverHeight(float height, PIDHoverType hoverType, float tau)
{
if (RootPart.PhysActor != null)
PhysicsActor pa = RootPart.PhysActor;
if (pa != null)
{
if (height != 0f)
{
RootPart.PhysActor.PIDHoverHeight = height;
RootPart.PhysActor.PIDHoverType = hoverType;
RootPart.PhysActor.PIDTau = tau;
RootPart.PhysActor.PIDHoverActive = true;
pa.PIDHoverHeight = height;
pa.PIDHoverType = hoverType;
pa.PIDTau = tau;
pa.PIDHoverActive = true;
}
else
{
RootPart.PhysActor.PIDHoverActive = false;
pa.PIDHoverActive = false;
}
}
}
@@ -2094,10 +2114,10 @@ namespace OpenSim.Region.Framework.Scenes
linkPart.ParentID = 0;
linkPart.LinkNum = 0;
if (linkPart.PhysActor != null)
{
m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
}
PhysicsActor linkPartPa = linkPart.PhysActor;
if (linkPartPa != null)
m_scene.PhysicsScene.RemovePrim(linkPartPa);
// We need to reset the child part's position
// ready for life as a separate object after being a part of another object
@@ -2188,17 +2208,19 @@ namespace OpenSim.Region.Framework.Scenes
{
if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
{
if (m_rootPart.PhysActor != null)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
{
if (m_rootPart.PhysActor.IsPhysical)
if (pa.IsPhysical)
{
if (!m_rootPart.BlockGrab)
{
Vector3 llmoveforce = pos - AbsolutePosition;
Vector3 grabforce = llmoveforce;
grabforce = (grabforce / 10) * m_rootPart.PhysActor.Mass;
m_rootPart.PhysActor.AddForce(grabforce, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
grabforce = (grabforce / 10) * pa.Mass;
pa.AddForce(grabforce, true);
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
else
@@ -2228,9 +2250,11 @@ namespace OpenSim.Region.Framework.Scenes
{
if (m_scene.EventManager.TriggerGroupSpinStart(UUID))
{
if (m_rootPart.PhysActor != null)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
{
if (m_rootPart.PhysActor.IsPhysical)
if (pa.IsPhysical)
{
m_rootPart.IsWaitingForFirstSpinUpdatePacket = true;
}
@@ -2271,12 +2295,13 @@ namespace OpenSim.Region.Framework.Scenes
// but it will result in over-shoot or under-shoot of the target orientation.
// For the end user, this means that ctrl+shift+drag can be used for relative,
// but not absolute, adjustments of orientation for physical prims.
if (m_scene.EventManager.TriggerGroupSpin(UUID, newOrientation))
{
if (m_rootPart.PhysActor != null)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
{
if (m_rootPart.PhysActor.IsPhysical)
if (pa.IsPhysical)
{
if (m_rootPart.IsWaitingForFirstSpinUpdatePacket)
{
@@ -2302,9 +2327,9 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.Error("SCENE OBJECT GROUP]: rotation axis is " + rotationAxis);
Vector3 spinforce = new Vector3(rotationAxis.X, rotationAxis.Y, rotationAxis.Z);
spinforce = (spinforce/8) * m_rootPart.PhysActor.Mass; // 8 is an arbitrary torque scaling factor
m_rootPart.PhysActor.AddAngularForce(spinforce,true);
m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
spinforce = (spinforce/8) * pa.Mass; // 8 is an arbitrary torque scaling factor
pa.AddAngularForce(spinforce,true);
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
else
@@ -2478,8 +2503,10 @@ namespace OpenSim.Region.Framework.Scenes
{
part.UpdateShape(shapeBlock);
if (part.PhysActor != null)
m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor);
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
}
@@ -2502,7 +2529,9 @@ namespace OpenSim.Region.Framework.Scenes
scale.Y = Math.Min(scale.Y, Scene.m_maxNonphys);
scale.Z = Math.Min(scale.Z, Scene.m_maxNonphys);
if (RootPart.PhysActor != null && RootPart.PhysActor.IsPhysical)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null && pa.IsPhysical)
{
scale.X = Math.Min(scale.X, Scene.m_maxPhys);
scale.Y = Math.Min(scale.Y, Scene.m_maxPhys);
@@ -2528,7 +2557,7 @@ namespace OpenSim.Region.Framework.Scenes
float f = 1.0f;
float a = 1.0f;
if (RootPart.PhysActor != null && RootPart.PhysActor.IsPhysical)
if (pa != null && pa.IsPhysical)
{
if (oldSize.X * x > m_scene.m_maxPhys)
{
@@ -2893,10 +2922,13 @@ namespace OpenSim.Region.Framework.Scenes
m_rootPart.StoreUndoState();
m_rootPart.UpdateRotation(rot);
if (m_rootPart.PhysActor != null)
PhysicsActor pa = m_rootPart.PhysActor;
if (pa != null)
{
m_rootPart.PhysActor.Orientation = m_rootPart.RotationOffset;
m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
pa.Orientation = m_rootPart.RotationOffset;
m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
}
SceneObjectPart[] parts = m_parts.GetArray();