diff options
author | Robert Adams | 2017-09-05 06:24:04 -0700 |
---|---|---|
committer | Robert Adams | 2017-09-05 06:24:04 -0700 |
commit | 921e3ceb09b04693d8241e27666d08c721efb82b (patch) | |
tree | 747b0b4dedded833b1a033bcd51a70121987ee5c /OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | |
parent | Fixed typos in comments in osslEnable.ini (diff) | |
parent | BulletSim: add raycast filtering (diff) | |
download | opensim-SC-921e3ceb09b04693d8241e27666d08c721efb82b.zip opensim-SC-921e3ceb09b04693d8241e27666d08c721efb82b.tar.gz opensim-SC-921e3ceb09b04693d8241e27666d08c721efb82b.tar.bz2 opensim-SC-921e3ceb09b04693d8241e27666d08c721efb82b.tar.xz |
BulletSim: Merge branch 'BulletSim2017'
Adds raycast using Bullet physics engine.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs index 57f03fb..7faee70 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | |||
@@ -496,8 +496,7 @@ public sealed class BSCharacter : BSPhysObject | |||
496 | public override OMV.Vector3 ForceVelocity { | 496 | public override OMV.Vector3 ForceVelocity { |
497 | get { return RawVelocity; } | 497 | get { return RawVelocity; } |
498 | set { | 498 | set { |
499 | PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity"); | 499 | DetailLog("{0},BSCharacter.ForceVelocity.set={1}", LocalID, value); |
500 | DetailLog("{0}: BSCharacter.ForceVelocity.set = {1}", LocalID, value); | ||
501 | 500 | ||
502 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); | 501 | RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); |
503 | PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity); | 502 | PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity); |
@@ -638,8 +637,6 @@ public sealed class BSCharacter : BSPhysObject | |||
638 | public override float ForceBuoyancy { | 637 | public override float ForceBuoyancy { |
639 | get { return _buoyancy; } | 638 | get { return _buoyancy; } |
640 | set { | 639 | set { |
641 | PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy"); | ||
642 | |||
643 | _buoyancy = value; | 640 | _buoyancy = value; |
644 | DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); | 641 | DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); |
645 | // Buoyancy is faked by changing the gravity applied to the object | 642 | // Buoyancy is faked by changing the gravity applied to the object |