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/BSCharacter.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/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs index ab9cc27..0eb5fba 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | |||
@@ -457,7 +457,7 @@ public sealed class BSCharacter : BSPhysObject | |||
457 | get { return RawVelocity; } | 457 | get { return RawVelocity; } |
458 | set { | 458 | set { |
459 | RawVelocity = value; | 459 | RawVelocity = value; |
460 | OMV.Vector3 vel = RawVelocity; | 460 | OMV.Vector3 vel = RawVelocity; |
461 | 461 | ||
462 | DetailLog("{0}: set Velocity = {1}", LocalID, value); | 462 | DetailLog("{0}: set Velocity = {1}", LocalID, value); |
463 | 463 | ||
@@ -662,10 +662,10 @@ public sealed class BSCharacter : BSPhysObject | |||
662 | addForce *= Mass * BSParam.AvatarAddForcePushFactor; | 662 | addForce *= Mass * BSParam.AvatarAddForcePushFactor; |
663 | 663 | ||
664 | DetailLog("{0},BSCharacter.addForce,call,force={1},addForce={2},push={3},mass={4}", LocalID, force, addForce, pushforce, Mass); | 664 | DetailLog("{0},BSCharacter.addForce,call,force={1},addForce={2},push={3},mass={4}", LocalID, force, addForce, pushforce, Mass); |
665 | AddForce(addForce, pushforce, false); | 665 | AddForce(false, addForce); |
666 | } | 666 | } |
667 | 667 | ||
668 | public override void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) { | 668 | public override void AddForce(bool inTaintTime, OMV.Vector3 force) { |
669 | if (force.IsFinite()) | 669 | if (force.IsFinite()) |
670 | { | 670 | { |
671 | OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude); | 671 | OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude); |
@@ -692,7 +692,7 @@ public sealed class BSCharacter : BSPhysObject | |||
692 | } | 692 | } |
693 | } | 693 | } |
694 | 694 | ||
695 | public override void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) { | 695 | public override void AddAngularForce(bool inTaintTime, OMV.Vector3 force) { |
696 | } | 696 | } |
697 | public override void SetMomentum(OMV.Vector3 momentum) { | 697 | public override void SetMomentum(OMV.Vector3 momentum) { |
698 | } | 698 | } |