diff options
author | Melanie | 2012-10-12 19:05:06 +0100 |
---|---|---|
committer | Melanie | 2012-10-12 19:05:06 +0100 |
commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 2a52e01..2e6b2da 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -263,7 +263,7 @@ public class BSCharacter : BSPhysObject | |||
263 | // A version of the sanity check that also makes sure a new position value is | 263 | // A version of the sanity check that also makes sure a new position value is |
264 | // pushed back to the physics engine. This routine would be used by anyone | 264 | // pushed back to the physics engine. This routine would be used by anyone |
265 | // who is not already pushing the value. | 265 | // who is not already pushing the value. |
266 | private bool PositionSanityCheck2(bool atTaintTime) | 266 | private bool PositionSanityCheck2(bool inTaintTime) |
267 | { | 267 | { |
268 | bool ret = false; | 268 | bool ret = false; |
269 | if (PositionSanityCheck()) | 269 | if (PositionSanityCheck()) |
@@ -275,7 +275,7 @@ public class BSCharacter : BSPhysObject | |||
275 | DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation); | 275 | DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation); |
276 | BulletSimAPI.SetObjectTranslation(PhysicsScene.WorldID, LocalID, _position, _orientation); | 276 | BulletSimAPI.SetObjectTranslation(PhysicsScene.WorldID, LocalID, _position, _orientation); |
277 | }; | 277 | }; |
278 | if (atTaintTime) | 278 | if (inTaintTime) |
279 | sanityOperation(); | 279 | sanityOperation(); |
280 | else | 280 | else |
281 | PhysicsScene.TaintedObject("BSCharacter.PositionSanityCheck", sanityOperation); | 281 | PhysicsScene.TaintedObject("BSCharacter.PositionSanityCheck", sanityOperation); |
@@ -332,6 +332,13 @@ public class BSCharacter : BSPhysObject | |||
332 | }); | 332 | }); |
333 | } | 333 | } |
334 | } | 334 | } |
335 | public override OMV.Vector3 ForceVelocity { | ||
336 | get { return _velocity; } | ||
337 | set { | ||
338 | _velocity = value; | ||
339 | BulletSimAPI.SetObjectVelocity(PhysicsScene.WorldID, LocalID, _velocity); | ||
340 | } | ||
341 | } | ||
335 | public override OMV.Vector3 Torque { | 342 | public override OMV.Vector3 Torque { |
336 | get { return _torque; } | 343 | get { return _torque; } |
337 | set { _torque = value; | 344 | set { _torque = value; |
@@ -432,6 +439,10 @@ public class BSCharacter : BSPhysObject | |||
432 | get { return _rotationalVelocity; } | 439 | get { return _rotationalVelocity; } |
433 | set { _rotationalVelocity = value; } | 440 | set { _rotationalVelocity = value; } |
434 | } | 441 | } |
442 | public override OMV.Vector3 ForceRotationalVelocity { | ||
443 | get { return _rotationalVelocity; } | ||
444 | set { _rotationalVelocity = value; } | ||
445 | } | ||
435 | public override bool Kinematic { | 446 | public override bool Kinematic { |
436 | get { return _kinematic; } | 447 | get { return _kinematic; } |
437 | set { _kinematic = value; } | 448 | set { _kinematic = value; } |