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

* More NINJA Joint physics fixes from nlin. 

fixes mantis #2874
0.6.2-post-fixes
Teravus Ovares 2008-12-28 16:30:00 +00:00
parent e9411a4c59
commit 6eed7fcd1e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -127,8 +127,8 @@ namespace OpenSim.Region.Physics.Manager
public abstract bool Selected { set; } public abstract bool Selected { set; }
public virtual String SOPName { get { return String.Empty; } set { return; } } public string SOPName;
public virtual String SOPDescription { get { return String.Empty; } set { return; } } public string SOPDescription;
public abstract void CrossingFailure(); public abstract void CrossingFailure();

16
OpenSim/Region/Physics/Manager/PhysicsJoint.cs
View File

@ -41,15 +41,15 @@ namespace OpenSim.Region.Physics.Manager
public class PhysicsJoint public class PhysicsJoint
{ {
public virtual bool IsInPhysicsEngine { get { return false; } } // set internally to indicate if this joint has already been passed to the physics engine or is still pending public virtual bool IsInPhysicsEngine { get { return false; } } // set internally to indicate if this joint has already been passed to the physics engine or is still pending
public virtual PhysicsJointType Type { get {return ((PhysicsJointType)(-1)); } set { return; } } public PhysicsJointType Type;
public virtual string RawParams { get { return string.Empty; } set { return; } } public string RawParams;
public List<string> BodyNames = new List<string>(); public List<string> BodyNames = new List<string>();
public virtual PhysicsVector Position { get { return PhysicsVector.Zero; } set { return; } } // global coords public PhysicsVector Position; // global coords
public virtual Quaternion Rotation { get { return Quaternion.Identity; } set { return; } } // global coords public Quaternion Rotation; // global coords
public virtual string ObjectNameInScene { get { return string.Empty; } set { return; } } // proxy object in scene that represents the joint position/orientation public string ObjectNameInScene; // proxy object in scene that represents the joint position/orientation
public virtual string TrackedBodyName { get { return string.Empty; } set { return; } } // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName) public string TrackedBodyName; // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName)
public virtual Quaternion LocalRotation { get { return Quaternion.Identity; } set { return; } } // joint orientation relative to one of the involved bodies, the tracked body public Quaternion LocalRotation; // joint orientation relative to one of the involved bodies, the tracked body
public virtual int ErrorMessageCount { get { return 0; } set { return; } } // total # of error messages printed for this joint since its creation. if too many, further error messages are suppressed to prevent flooding. public int ErrorMessageCount; // total # of error messages printed for this joint since its creation. if too many, further error messages are suppressed to prevent flooding.
public const int maxErrorMessages = 100; // no more than this # of error messages will be printed for each joint public const int maxErrorMessages = 100; // no more than this # of error messages will be printed for each joint
} }
} }

2
OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
View File

@ -44,6 +44,6 @@ namespace OpenSim.Region.Physics.OdePlugin
return (jointID != IntPtr.Zero); return (jointID != IntPtr.Zero);
} }
} }
public virtual IntPtr jointID { get { return IntPtr.Zero; } set { return; } } public IntPtr jointID;
} }
} }