diff options
author | Robert Adams | 2012-03-16 17:13:06 -0700 |
---|---|---|
committer | Robert Adams | 2012-03-23 13:15:16 -0700 |
commit | 6ecdadb32999aed776df29e53541326958daf836 (patch) | |
tree | f0c5fff2d7e0edf8f7688b3431c8b02e7cc0fa0b /OpenSim | |
parent | BulletSim: add some new runtime setable parameters to match the dll. (diff) | |
download | opensim-SC_OLD-6ecdadb32999aed776df29e53541326958daf836.zip opensim-SC_OLD-6ecdadb32999aed776df29e53541326958daf836.tar.gz opensim-SC_OLD-6ecdadb32999aed776df29e53541326958daf836.tar.bz2 opensim-SC_OLD-6ecdadb32999aed776df29e53541326958daf836.tar.xz |
BulletSim: set buoyancy in only one place
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 0cab5d1..e816b61 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -260,11 +260,8 @@ public class BSCharacter : PhysicsActor | |||
260 | get { return _flying; } | 260 | get { return _flying; } |
261 | set { | 261 | set { |
262 | _flying = value; | 262 | _flying = value; |
263 | _scene.TaintedObject(delegate() | 263 | // simulate flying by changing the effect of gravity |
264 | { | 264 | this.Buoyancy(_flying ? 1f : 0f); |
265 | // simulate flying by changing the effect of gravity | ||
266 | BulletSimAPI.SetObjectBuoyancy(_scene.WorldID, LocalID, _flying ? 1f : 0f); | ||
267 | }); | ||
268 | } | 265 | } |
269 | } | 266 | } |
270 | public override bool | 267 | public override bool |
@@ -299,6 +296,7 @@ public class BSCharacter : PhysicsActor | |||
299 | get { return _kinematic; } | 296 | get { return _kinematic; } |
300 | set { _kinematic = value; } | 297 | set { _kinematic = value; } |
301 | } | 298 | } |
299 | // neg=fall quickly, 0=1g, 1=0g, pos=float up | ||
302 | public override float Buoyancy { | 300 | public override float Buoyancy { |
303 | get { return _buoyancy; } | 301 | get { return _buoyancy; } |
304 | set { _buoyancy = value; | 302 | set { _buoyancy = value; |