Super dodgy fix for bullet collision callback problems.

modules/mojo3d/scene/native/collisiondetect.cpp

@@ -8,32 +8,65 @@ namespace{
 	void **_collp=_colls;
 }
 
+/*
 void collisionCallback( btDynamicsWorld *world,btScalar timeStep ){
 
 	int numManifolds=world->getDispatcher()->getNumManifolds();
 	
 	for( int i=0;i<numManifolds;++i ){
 
-		btPersistentManifold *contactManifold=world->getDispatcher()->getManifoldByIndexInternal( i );
-        
-		const btCollisionObject *body0=contactManifold->getBody0();
-		const btCollisionObject *body1=contactManifold->getBody1();
+		btPersistentManifold *contactManifold=world->getDispatcher()->getManifoldByIndexInternal( i ); 
+		
+//		printf( "procing %f breaking %f\n",contactManifold->getContactProcessingThreshold(),contactManifold->getContactBreakingThreshold() );
+//		fflush( stdout );
+
+		int numContacts=contactManifold->getNumContacts();
+		if( !numContacts ) continue;
 		
-        int numContacts=contactManifold->getNumContacts();
-        
         for( int j=0;j<numContacts;++j ){
         
-            btManifoldPoint &pt=contactManifold->getContactPoint(j);
-            
-            if( pt.getDistance()<0.0f ){
+			btManifoldPoint &pt=contactManifold->getContactPoint( j );
+			
+			printf( "pt.distance %f \n",pt.getDistance() );fflush( stdout );
+
+			if( contactManifold->validContactDistance( pt ) ){	            
+//			if( pt.getDistance()<0.0f ){
 	            
-				*_collp++=body0->getUserPointer();
+				printf( "pt.distance %f \n",pt.getDistance() );fflush( stdout );
+
+				const btCollisionObject *body0=contactManifold->getBody0();
+				const btCollisionObject *body1=contactManifold->getBody1();
+		
+				*_collp++=body0->getUserPointer(); //nasty global somewhere
 				*_collp++=body1->getUserPointer();
+				
 				break;
 			}
-        }
+		}
 	}
 }
+*/
+
+///*
+void collisionCallback( btDynamicsWorld *world,btScalar timeStep ){
+
+	int numManifolds=world->getDispatcher()->getNumManifolds();
+	
+	for( int i=0;i<numManifolds;++i ){
+
+		btPersistentManifold *contactManifold=world->getDispatcher()->getManifoldByIndexInternal( i );
+
+        int numContacts=contactManifold->getNumContacts();
+		if( !numContacts ) continue;
+
+		const btCollisionObject *body0=contactManifold->getBody0();
+		const btCollisionObject *body1=contactManifold->getBody1();
+
+		*_collp++=body0->getUserPointer();
+		*_collp++=body1->getUserPointer();
+	}
+}
+//*/
 
 bool contactAddedCallback( btManifoldPoint &cp,const btCollisionObjectWrapper *colObj0,int partId0,int index0,const btCollisionObjectWrapper *colObj1,int partId1,int index1 ){
 
@@ -43,7 +76,7 @@ bool contactAddedCallback( btManifoldPoint &cp,const btCollisionObjectWrapper *c
 
 bool contactProcessedCallback( btManifoldPoint &cp,void *body0,void *body1 ){
 
-	//printf( "contact processed!\n" );fflush( stdout );
+	printf( "contact processed!\n" );fflush( stdout );
 	return true;
 }
 
@@ -85,7 +118,6 @@ void initCollisions( btDynamicsWorld *world ){
 	world->setInternalTickCallback( &collisionCallback,0,false );
 	
 //	gContactAddedCallback=&contactAddedCallback;
-	
 //	gContactProcessedCallback=&contactProcessedCallback;
 //	gContactDestroyedCallback=&contactDestroyedCallback;
 }