diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index ce0fbe6..2017fa5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -38,6 +38,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
38 | // Each type of linkset will define the information needed for its type. | 38 | // Each type of linkset will define the information needed for its type. |
39 | public abstract class BSLinksetInfo | 39 | public abstract class BSLinksetInfo |
40 | { | 40 | { |
41 | public virtual void Clear() { } | ||
41 | } | 42 | } |
42 | 43 | ||
43 | public abstract class BSLinkset | 44 | public abstract class BSLinkset |
@@ -95,13 +96,6 @@ public abstract class BSLinkset | |||
95 | return BSPhysicsShapeType.SHAPE_UNKNOWN; | 96 | return BSPhysicsShapeType.SHAPE_UNKNOWN; |
96 | } | 97 | } |
97 | 98 | ||
98 | // Linksets move around the children so the linkset might need to compute the child position | ||
99 | public virtual OMV.Vector3 Position(BSPhysObject member) | ||
100 | { return member.RawPosition; } | ||
101 | public virtual OMV.Quaternion Orientation(BSPhysObject member) | ||
102 | { return member.RawOrientation; } | ||
103 | // TODO: does this need to be done for Velocity and RotationalVelocityy? | ||
104 | |||
105 | // We keep the prim's mass in the linkset structure since it could be dependent on other prims | 99 | // We keep the prim's mass in the linkset structure since it could be dependent on other prims |
106 | protected float m_mass; | 100 | protected float m_mass; |
107 | public float LinksetMass | 101 | public float LinksetMass |
@@ -258,8 +252,9 @@ public abstract class BSLinkset | |||
258 | 252 | ||
259 | // Called when a parameter update comes from the physics engine for any object | 253 | // Called when a parameter update comes from the physics engine for any object |
260 | // of the linkset is received. | 254 | // of the linkset is received. |
255 | // Passed flag is update came from physics engine (true) or the user (false). | ||
261 | // Called at taint-time!! | 256 | // Called at taint-time!! |
262 | public abstract void UpdateProperties(BSPhysObject physObject); | 257 | public abstract void UpdateProperties(BSPhysObject physObject, bool physicalUpdate); |
263 | 258 | ||
264 | // Routine used when rebuilding the body of the root of the linkset | 259 | // Routine used when rebuilding the body of the root of the linkset |
265 | // Destroy all the constraints have have been made to root. | 260 | // Destroy all the constraints have have been made to root. |