Changeset 8845 in orxonox.OLD

Timestamp:

Jun 28, 2006, 12:22:38 PM (18 years ago)

Author:

patrick

Message:

more collision checks

Location:

branches/multi_player_map/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• story_entities/multi_player_world.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/multi_player_map/src/lib/collision_detection/obb_tree_node.cc

@@ -455 +455 @@
     return;
 
-
   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
-
   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
 
-  PRINTF(5)(" %s vs %s: distanceMax: %f, distance: %f\n", nodeA->getClassName(), nodeB->getClassName(), distanceMax, distance);
-
-
+  if( distance < distanceMax)
+    PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
 
   PRINTF(4)("collideWith\n");

branches/multi_player_map/src/story_entities/multi_player_world.cc

@@ -118 +118 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
   PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_01 vs OM_GROUP_00_PROJ\n\n");
@@ -123 +125 @@
     this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_00));
-
+    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+    this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 }
 

branches/multi_player_map/src/world_entities/world_entity.cc

@@ -412 +412 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
-  PRINTF(0)("registering collision\n\n\n\n");
   // is there any handler listening?
   if( !this->bReactive)