From f53b4e7a21f62a84e237c4ce8d2806124c3a76d2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 1 Nov 2012 10:53:55 -0700
Subject: 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.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 8ce960d..1754be6 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -256,6 +256,11 @@ public sealed class BSPrim : BSPhysObject
         return;
     }
 
+    public override OMV.Vector3 RawPosition
+    {
+        get { return _position; }
+        set { _position = value; }
+    }
     public override OMV.Vector3 Position {
         get {
             if (!Linkset.IsRoot(this))
@@ -366,7 +371,7 @@ public sealed class BSPrim : BSPhysObject
     }
 
     // used when we only want this prim's mass and not the linkset thing
-    public override float MassRaw { 
+    public override float RawMass { 
         get { return _mass; }
     }
     // Set the physical mass to the passed mass.
@@ -530,6 +535,11 @@ public sealed class BSPrim : BSPhysObject
         get { return _acceleration; }
         set { _acceleration = value; }
     }
+    public override OMV.Quaternion RawOrientation
+    {
+        get { return _orientation; }
+        set { _orientation = value; }
+    }
     public override OMV.Quaternion Orientation {
         get {
             if (!Linkset.IsRoot(this))
@@ -703,7 +713,7 @@ public sealed class BSPrim : BSPhysObject
             BulletSimAPI.SetTranslation2(PhysBody.ptr, _position, _orientation);
 
             // A dynamic object has mass
-            UpdatePhysicalMassProperties(MassRaw);
+            UpdatePhysicalMassProperties(RawMass);
 
             // Set collision detection parameters
             if (PhysicsScene.Params.ccdMotionThreshold > 0f)
-- 
cgit v1.1