Changeset 5046 in orxonox.OLD for orxonox/trunk

Timestamp:

Aug 16, 2005, 9:20:20 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: if a collision occures, the virtual WorldEntity::collidesWith(WorldEntity*, Vector) is called of both objects. the reaction to the collision has to be defined there. default reaction is still output into stdout console. There is now more information

Location:

orxonox/trunk/src

Files:

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

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

@@ -655 +655 @@
     if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
     {
-      nodeA->collidesWith(nodeB);
-      nodeB->collidesWith(nodeA);
+      nodeA->collidesWith(nodeB, *((OBBTreeNode*)treeNode)->bvElement->center);
+
+      nodeB->collidesWith(nodeA, *this->bvElement->center);
     }
 

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

@@ -69 +69 @@
     int                 tmpLen2;                    //!< len vert data obbox2
 
-    static float**       coMat;                     //!< temp covariance matrice save place - consumes less mem
-    static float**       eigvMat;                   //!< temp eigenvector matrice save place
-    static float*        eigvlMat;                  //!< temp eigenvalue vector save place
-    static int*          rotCount;                  //!< temp rotations count save place: how many givens-rotations where needed to transform the matrix :)
+    static float**      coMat;                      //!< temp covariance matrice save place - consumes less mem
+    static float**      eigvMat;                    //!< temp eigenvector matrice save place
+    static float*       eigvlMat;                   //!< temp eigenvalue vector save place
+    static int*         rotCount;                   //!< temp rotations count save place: how many givens-rotations where needed to transform the matrix :)
 
-    GLUquadricObj*    sphereObj;
+    GLUquadricObj*      sphereObj;
 };
 

orxonox/trunk/src/world_entities/npc.cc

@@ -43 +43 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("COLLISION with an NPC\n");
+  PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -97 +97 @@
 {}
 
-/**
- *  this function is called, when two entities collide
- * @param entity: the world entity with whom it collides
- *
- * Implement behaviour like damage application or other miscellaneous collision stuff in this function
-*/
-void WorldEntity::collidesWith(WorldEntity* entity)
-{
-  PRINTF(0)("COLLISION with a WorldEntity\n");
-}
-
 
 /**
@@ -117 +106 @@
 void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("COLLISION with a WorldEntity\n");
+  PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -51 +51 @@
 
   virtual void hit (WorldEntity* weapon, Vector* loc);
-  virtual void collidesWith (WorldEntity* entity);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);