diff options
author | Robert Adams | 2012-12-24 08:56:02 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-24 08:56:02 -0800 |
commit | 80cee1b85a646045c02e2bb675056d532ce2fe27 (patch) | |
tree | dc9347a2eeb3241cdd30f50d448b630ce5d5c4f9 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | * Update BulletSimN terrain implementation to default to Heightfield, it's le... (diff) | |
download | opensim-SC-80cee1b85a646045c02e2bb675056d532ce2fe27.zip opensim-SC-80cee1b85a646045c02e2bb675056d532ce2fe27.tar.gz opensim-SC-80cee1b85a646045c02e2bb675056d532ce2fe27.tar.bz2 opensim-SC-80cee1b85a646045c02e2bb675056d532ce2fe27.tar.xz |
BulletSim: Fix single physical prim reporting its mass as zero.
Properly return root mass as mass of just the root prim rather
than the mass of the linkset. SOG has the logic to add the masses
together to get the linkset mass.
Update TODO list.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index c76f869..4bed535 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -96,7 +96,8 @@ public abstract class BSPhysObject : PhysicsActor | |||
96 | // Return the object mass without calculating it or having side effects | 96 | // Return the object mass without calculating it or having side effects |
97 | public abstract float RawMass { get; } | 97 | public abstract float RawMass { get; } |
98 | // Set the raw mass but also update physical mass properties (inertia, ...) | 98 | // Set the raw mass but also update physical mass properties (inertia, ...) |
99 | public abstract void UpdatePhysicalMassProperties(float mass); | 99 | // 'inWorld' true if the object has already been added to the dynamic world. |
100 | public abstract void UpdatePhysicalMassProperties(float mass, bool inWorld); | ||
100 | 101 | ||
101 | // The last value calculated for the prim's inertia | 102 | // The last value calculated for the prim's inertia |
102 | public OMV.Vector3 Inertia { get; set; } | 103 | public OMV.Vector3 Inertia { get; set; } |