diff options
| author | Robert Adams | 2012-10-14 19:23:35 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-19 10:52:06 -0700 |
| commit | eaccfa6d99ac51b4963ae0fa457ff0d2b9ce65e7 (patch) | |
| tree | 3fb006e93c8599a124369b2b4da16c72fea540ec /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | BulletSim: Update BSCharacter to use API2 interface. (diff) | |
| download | opensim-SC_OLD-eaccfa6d99ac51b4963ae0fa457ff0d2b9ce65e7.zip opensim-SC_OLD-eaccfa6d99ac51b4963ae0fa457ff0d2b9ce65e7.tar.gz opensim-SC_OLD-eaccfa6d99ac51b4963ae0fa457ff0d2b9ce65e7.tar.bz2 opensim-SC_OLD-eaccfa6d99ac51b4963ae0fa457ff0d2b9ce65e7.tar.xz | |
BulletSim: Fix small problems with last patch: BSScene.World properly initialized and setting of C++ parameters commented out. Comments and logging added.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 7c2f856..7bc6b69 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -146,7 +146,7 @@ public class BSCharacter : BSPhysObject | |||
| 146 | 146 | ||
| 147 | ZeroMotion(); | 147 | ZeroMotion(); |
| 148 | 148 | ||
| 149 | OMV.Vector3 localInertia = BulletSimAPI.CalculateLocalInertia2(BSBody.ptr, MassRaw); | 149 | OMV.Vector3 localInertia = BulletSimAPI.CalculateLocalInertia2(BSShape.ptr, MassRaw); |
| 150 | BulletSimAPI.SetMassProps2(BSBody.ptr, MassRaw, localInertia); | 150 | BulletSimAPI.SetMassProps2(BSBody.ptr, MassRaw, localInertia); |
| 151 | 151 | ||
| 152 | // Set the velocity and compute the proper friction | 152 | // Set the velocity and compute the proper friction |