diff options
author | Robert Adams | 2016-01-18 07:02:48 -0800 |
---|---|---|
committer | Robert Adams | 2016-01-18 07:02:48 -0800 |
commit | 35d4298be698d9eb02974a4210c5ace867b0db35 (patch) | |
tree | ad3cb41a236cfceaac1629eaec919b522205b00a /OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |
parent | BulletSim: revert avatar stationary testing for having slight velocity. (diff) | |
download | opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.zip opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.gz opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.bz2 opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.xz |
BulletSim: change method signatures for internal AddForce methods to remove
confusion about push forces. The latter is an external, physics engine interface
feature (the force parameter has a different unit if pushing vs adding force)
and that distinction is not used internally.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index b50e4cc..ff6baca 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
@@ -245,10 +245,10 @@ public abstract class BSPhysObject : PhysicsActor | |||
245 | 245 | ||
246 | public override void AddAngularForce(OMV.Vector3 force, bool pushforce) | 246 | public override void AddAngularForce(OMV.Vector3 force, bool pushforce) |
247 | { | 247 | { |
248 | AddAngularForce(force, pushforce, false); | 248 | AddAngularForce(false, force); |
249 | } | 249 | } |
250 | public abstract void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime); | 250 | public abstract void AddAngularForce(bool inTaintTime, OMV.Vector3 force); |
251 | public abstract void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime); | 251 | public abstract void AddForce(bool inTaintTime, OMV.Vector3 force); |
252 | 252 | ||
253 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } | 253 | public abstract OMV.Vector3 ForceRotationalVelocity { get; set; } |
254 | 254 | ||