aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2013-02-07 11:53:49 -0800
committerRobert Adams2013-02-07 17:13:27 -0800
commitebb63b55aab98da6d44e82fc0ecfd5d22f245172 (patch)
tree4c695e5e577547e5c2562f23f8bb1ad06177447f /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
parentExtend TestJsonReadNotecard() for reads to non-root locations and fake stores. (diff)
downloadopensim-SC-ebb63b55aab98da6d44e82fc0ecfd5d22f245172.zip
opensim-SC-ebb63b55aab98da6d44e82fc0ecfd5d22f245172.tar.gz
opensim-SC-ebb63b55aab98da6d44e82fc0ecfd5d22f245172.tar.bz2
opensim-SC-ebb63b55aab98da6d44e82fc0ecfd5d22f245172.tar.xz
BulletSim: add user setting of friction, density and restitution.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 192bcb5..d694a6a 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -749,9 +749,10 @@ public sealed class BSCharacter : BSPhysObject
749 _buoyancy = value; 749 _buoyancy = value;
750 DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); 750 DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
751 // Buoyancy is faked by changing the gravity applied to the object 751 // Buoyancy is faked by changing the gravity applied to the object
752 float grav = PhysicsScene.Params.gravity * (1f - _buoyancy); 752 float grav = BSParam.Gravity * (1f - _buoyancy);
753 Gravity = new OMV.Vector3(0f, 0f, grav);
753 if (PhysBody.HasPhysicalBody) 754 if (PhysBody.HasPhysicalBody)
754 PhysicsScene.PE.SetGravity(PhysBody, new OMV.Vector3(0f, 0f, grav)); 755 PhysicsScene.PE.SetGravity(PhysBody, Gravity);
755 } 756 }
756 } 757 }
757 758