diff options
author | UbitUmarov | 2015-10-21 00:15:09 +0100 |
---|---|---|
committer | UbitUmarov | 2015-10-21 00:15:09 +0100 |
commit | deb4364f4299be39600f393e2d384c757ffa5ee6 (patch) | |
tree | d9643c7b22dcfcb31bf7b55cf71e220fe3252b47 /OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |
parent | the inertia matrix inversions and body inertia changes to implement axis loc... (diff) | |
download | opensim-SC_OLD-deb4364f4299be39600f393e2d384c757ffa5ee6.zip opensim-SC_OLD-deb4364f4299be39600f393e2d384c757ffa5ee6.tar.gz opensim-SC_OLD-deb4364f4299be39600f393e2d384c757ffa5ee6.tar.bz2 opensim-SC_OLD-deb4364f4299be39600f393e2d384c757ffa5ee6.tar.xz |
remove the use of Vector3 for axis locks on the rest of engines
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs index 83f8af8..ebd2185 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |||
@@ -230,21 +230,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
230 | 230 | ||
231 | public abstract void delink(); | 231 | public abstract void delink(); |
232 | 232 | ||
233 | public virtual void LockAngularMotion(Vector3 axis) { } | 233 | public abstract void LockAngularMotion(byte axislocks); |
234 | 234 | ||
235 | public virtual void LockAngularMotion(byte axislocks) | ||
236 | { | ||
237 | Vector3 lrRotationAxis = Vector3.One; | ||
238 | if((axislocks & 0x02) != 0 ) | ||
239 | lrRotationAxis.X = 0f; | ||
240 | if((axislocks & 0x04) != 0 ) | ||
241 | lrRotationAxis.Y = 0f; | ||
242 | if((axislocks & 0x08) != 0 ) | ||
243 | lrRotationAxis.Z = 0f; | ||
244 | |||
245 | LockAngularMotion(lrRotationAxis); | ||
246 | } | ||
247 | |||
248 | public virtual void RequestPhysicsterseUpdate() | 235 | public virtual void RequestPhysicsterseUpdate() |
249 | { | 236 | { |
250 | // Make a temporary copy of the event to avoid possibility of | 237 | // Make a temporary copy of the event to avoid possibility of |
@@ -661,7 +648,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
661 | 648 | ||
662 | public override void link(PhysicsActor obj) { } | 649 | public override void link(PhysicsActor obj) { } |
663 | public override void delink() { } | 650 | public override void delink() { } |
664 | public override void LockAngularMotion(Vector3 axis) { } | 651 | public override void LockAngularMotion(byte axislocks) { } |
665 | public override void AddForce(Vector3 force, bool pushforce) { } | 652 | public override void AddForce(Vector3 force, bool pushforce) { } |
666 | public override void AddAngularForce(Vector3 force, bool pushforce) { } | 653 | public override void AddAngularForce(Vector3 force, bool pushforce) { } |
667 | 654 | ||