diff options
author | Robert Adams | 2013-07-06 08:22:59 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-06 08:25:15 -0700 |
commit | a65cec3986431f5a2f4f9eb2424157def0d035c8 (patch) | |
tree | 5e8ea300f4d9042c52f0cc89367cb0e9dc7e3dee /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | BulletSim: More tweaking on center-of-mass. Almost there. Changes have no eff... (diff) | |
download | opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.zip opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.gz opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.bz2 opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.xz |
BulletSim: implementation of linkset center-of-mass.
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index a0d5c42..738e2d0 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -90,6 +90,8 @@ public abstract class BSPhysObject : PhysicsActor | |||
90 | PhysBody = new BulletBody(localID); | 90 | PhysBody = new BulletBody(localID); |
91 | PhysShape = new BSShapeNull(); | 91 | PhysShape = new BSShapeNull(); |
92 | 92 | ||
93 | UserSetCenterOfMassDisplacement = null; | ||
94 | |||
93 | PrimAssetState = PrimAssetCondition.Unknown; | 95 | PrimAssetState = PrimAssetCondition.Unknown; |
94 | 96 | ||
95 | // Default material type. Also sets Friction, Restitution and Density. | 97 | // Default material type. Also sets Friction, Restitution and Density. |
@@ -180,6 +182,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
180 | Material = (MaterialAttributes.Material)material; | 182 | Material = (MaterialAttributes.Material)material; |
181 | 183 | ||
182 | // Setting the material sets the material attributes also. | 184 | // Setting the material sets the material attributes also. |
185 | // TODO: decide if this is necessary -- the simulator does this. | ||
183 | MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false); | 186 | MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false); |
184 | Friction = matAttrib.friction; | 187 | Friction = matAttrib.friction; |
185 | Restitution = matAttrib.restitution; | 188 | Restitution = matAttrib.restitution; |