diff options
author | Robert Adams | 2012-11-01 10:53:55 -0700 |
---|---|---|
committer | Robert Adams | 2012-11-03 21:15:22 -0700 |
commit | f53b4e7a21f62a84e237c4ce8d2806124c3a76d2 (patch) | |
tree | 1a815eafa4cec6e930b527fe81985b37f25f006a /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |
parent | BulletSim: Remove use of shapeData in ShapeCollection and rely on the availab... (diff) | |
download | opensim-SC_OLD-f53b4e7a21f62a84e237c4ce8d2806124c3a76d2.zip opensim-SC_OLD-f53b4e7a21f62a84e237c4ce8d2806124c3a76d2.tar.gz opensim-SC_OLD-f53b4e7a21f62a84e237c4ce8d2806124c3a76d2.tar.bz2 opensim-SC_OLD-f53b4e7a21f62a84e237c4ce8d2806124c3a76d2.tar.xz |
BulletSim: Add RawPosition and RawOrientation to BSPhysObject and rename MassRaw to RawMass. Fix BSShapeCollection to use Raw* for creating the body to eliminate exception from referencing the physical body before it has been created.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index 478924a..e131919 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
@@ -811,7 +811,7 @@ public sealed class BSShapeCollection : IDisposable | |||
811 | if (prim.IsSolid) | 811 | if (prim.IsSolid) |
812 | { | 812 | { |
813 | bodyPtr = BulletSimAPI.CreateBodyFromShape2(sim.ptr, shape.ptr, | 813 | bodyPtr = BulletSimAPI.CreateBodyFromShape2(sim.ptr, shape.ptr, |
814 | prim.LocalID, prim.ForcePosition, prim.ForceOrientation); | 814 | prim.LocalID, prim.RawPosition, prim.RawOrientation); |
815 | DetailLog("{0},BSShapeCollection.CreateBody,mesh,ptr={1}", prim.LocalID, bodyPtr.ToString("X")); | 815 | DetailLog("{0},BSShapeCollection.CreateBody,mesh,ptr={1}", prim.LocalID, bodyPtr.ToString("X")); |
816 | } | 816 | } |
817 | else | 817 | else |