aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-16 08:11:05 +0000
committerTeravus Ovares2009-04-16 08:11:05 +0000
commit8a7a0190e69b466217a9c4cb6eb57abc1f5629ee (patch)
tree6c5b274158af3b89620e2fcdb33513abde9f4ba4 /OpenSim/Region/Physics/BulletDotNETPlugin
parent* Committing more BulletDotNETPlugin work (diff)
downloadopensim-SC_OLD-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.zip
opensim-SC_OLD-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.gz
opensim-SC_OLD-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.bz2
opensim-SC_OLD-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.xz
* Remove some super experimental stuff in BulletDotNETPlugin since it was causing issues.
* Tweak the ODEPrim PID a bit more.
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs4
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 5ff73c5..ec982c6 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -2140,8 +2140,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
2140 ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1)); 2140 ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1));
2141 ((btGImpactMeshShape) prim_geom).updateBound(); 2141 ((btGImpactMeshShape) prim_geom).updateBound();
2142 } 2142 }
2143 Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK); 2143 //Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
2144 Body.setUserPointer((IntPtr) m_localID); 2144 //Body.setUserPointer((IntPtr) (int)m_localID);
2145 _parent_scene.AddPrimToScene(this); 2145 _parent_scene.AddPrimToScene(this);
2146 } 2146 }
2147 else 2147 else
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index fecd4a1..0a375b2 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
134 m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration); 134 m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
135 m_world = new btDiscreteDynamicsWorld(m_dispatcher, m_broadphase, m_solver, m_collisionConfiguration); 135 m_world = new btDiscreteDynamicsWorld(m_dispatcher, m_broadphase, m_solver, m_collisionConfiguration);
136 m_world.setGravity(m_gravity); 136 m_world.setGravity(m_gravity);
137 EnableCollisionInterface(); 137 //EnableCollisionInterface();
138 138
139 139
140 } 140 }