Changeset 5044 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Aug 16, 2005, 8:44:55 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: cd now works all obj-obj collisions are detected and for each is a message displayed in the console. since the small enemy spacefracts follow the player at one point - there are many collisions at the same time…

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -629 +629 @@
   if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {
-    PRINTF(0)("collision @ lvl %i, object %s vs. %s: ", this->depth, nodeA->getClassName(), nodeB->getClassName());
+    PRINTF(3)("collision @ lvl %i, object %s vs. %s, (%p, %p)\n", this->depth, nodeA->getClassName(), nodeB->getClassName(), this->nodeLeft, this->nodeRight);
 
     /* check if left node overlaps */
     if( likely( this->nodeLeft != NULL))
     {
-      PRINT(0)("l, ");
       PRINT(3)("Checking OBB %i vs %i: ", this->nodeLeft->getIndex(), treeNode->getIndex());
       if( this->overlapTest(this->nodeLeft->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
@@ -645 +644 @@
     if( likely( this->nodeRight != NULL))
     {
-      PRINT(0)("r, ");
       PRINT(3)("Checking OBB %i vs %i: ", this->nodeRight->getIndex(), treeNode->getIndex());
       if(this->overlapTest(this->nodeRight->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
@@ -652 +650 @@
        this->nodeRight->collideWith(((OBBTreeNode*)treeNode)->nodeRight, nodeA, nodeB);
       }
-
-      PRINT(0)("\n");
-      /* so there is a collision and this is the last box in the tree (i.e. leaf) */
-      if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
-      {
-        PRINT(0)("COLLISOIN\n");
-        nodeA->collidesWith(nodeB);
-        nodeB->collidesWith(nodeA);
-      }
-    }
+    }
+
+    /* so there is a collision and this is the last box in the tree (i.e. leaf) */
+    if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
+    {
+      nodeA->collidesWith(nodeB);
+      nodeB->collidesWith(nodeA);
+    }
+
   }
 }

orxonox/trunk/src/story_entities/world.cc

@@ -756 +756 @@
       if( this->bQuitCurrentGame || this->bQuitOrxonox)
           break;
-      // Process collision
-      this->collide ();
       // Process time
       this->tick ();
       // Update the state
       this->update ();
+      // Process collision
+      this->collide ();
       // Draw
       this->display ();

orxonox/trunk/src/world_entities/npc.cc

@@ -43 +43 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("COLLISION ---------------------------- with object: %s\n", entity->getName());
+  PRINTF(0)("COLLISION with an NPC\n");
 }
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -105 +105 @@
 void WorldEntity::collidesWith(WorldEntity* entity)
 {
-  //this->obbTree->collideWith(entity->obbTree, (PNode*)this, (PNode*)entity);]
-  PRINTF(0)("COLLISION ---------------------------- with object: %s\n", entity->getName());
+  PRINTF(0)("COLLISION with a WorldEntity\n");
 }
 
@@ -118 +117 @@
 void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  //this->obbTree->collideWith(entity->obbTree, (PNode*)this, (PNode*)entity);]
-  PRINTF(0)("COLLISION ---------------------------- with object: %s\n", entity->getName());
+  PRINTF(0)("COLLISION with a WorldEntity\n");
 }