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/BSPhysObject.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/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 7d91468..65d7f34 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -63,7 +63,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
63 | public BSLinkset Linkset { get; set; } | 63 | public BSLinkset Linkset { get; set; } |
64 | 64 | ||
65 | // Return the object mass without calculating it or having side effects | 65 | // Return the object mass without calculating it or having side effects |
66 | public abstract float MassRaw { get; } | 66 | public abstract float RawMass { get; } |
67 | // Set the raw mass but also update physical mass properties (inertia, ...) | 67 | // Set the raw mass but also update physical mass properties (inertia, ...) |
68 | public abstract void UpdatePhysicalMassProperties(float mass); | 68 | public abstract void UpdatePhysicalMassProperties(float mass); |
69 | 69 | ||
@@ -105,8 +105,10 @@ public abstract class BSPhysObject : PhysicsActor | |||
105 | // Tell the object to clean up. | 105 | // Tell the object to clean up. |
106 | public abstract void Destroy(); | 106 | public abstract void Destroy(); |
107 | 107 | ||
108 | public abstract OMV.Vector3 RawPosition { get; set; } | ||
108 | public abstract OMV.Vector3 ForcePosition { get; set; } | 109 | public abstract OMV.Vector3 ForcePosition { get; set; } |
109 | 110 | ||
111 | public abstract OMV.Quaternion RawOrientation { get; set; } | ||
110 | public abstract OMV.Quaternion ForceOrientation { get; set; } | 112 | public abstract OMV.Quaternion ForceOrientation { get; set; } |
111 | 113 | ||
112 | public abstract OMV.Vector3 ForceVelocity { get; set; } | 114 | public abstract OMV.Vector3 ForceVelocity { get; set; } |