ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Remove some super experimental stuff in BulletDotNETPlugin since it was causing issues.

Browse Source 
* Tweak the ODEPrim PID a bit more.
This commit is contained in:
Teravus Ovares
2009-04-16 08:11:05 +00:00
parent eac5d4015d
commit 8a7a0190e6
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
View File

@@ -2140,8 +2140,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1));
((btGImpactMeshShape) prim_geom).updateBound();
}
Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
Body.setUserPointer((IntPtr) m_localID);
//Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
//Body.setUserPointer((IntPtr) (int)m_localID);
_parent_scene.AddPrimToScene(this);
}
else

2
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
View File

@@ -134,7 +134,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
m_world = new btDiscreteDynamicsWorld(m_dispatcher, m_broadphase, m_solver, m_collisionConfiguration);
m_world.setGravity(m_gravity);
EnableCollisionInterface();
//EnableCollisionInterface();
}