Changeset 8341 in orxonox.OLD for branches/bsp_model

Timestamp:

Jun 13, 2006, 12:00:01 PM (18 years ago)

Author:

patrick

Message:

bsp: better debug output

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• lib/graphics/importer/bsp_manager.cc (modified) (1 diff)
• world_entities/space_ships/collision_probe.cc (modified) (3 diffs)
• world_entities/space_ships/collision_probe.h (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/bsp_model/src/lib/collision_reaction/collision_handle.cc

@@ -227 +227 @@
   {
     if( collisionEvent->getEntityA() == this->owner) {
-      if( collisionEvent->getEntityB()->isA((ClassID)(*it)))
+      if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
+        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+                  collisionEvent->getEntityB()->getClassName(), *it);
         return true; }
+    }
     else {
-      if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
-        return true; }
+      if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
+        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+                  collisionEvent->getEntityA()->getClassName(), *it);
+      return true; }
+    }
   }
 

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -63 +63 @@
 //   collision->getEntityB()->getAbsCoor().debug();
 
-  collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPositions[5]);
+  PRINTF(0)("Collision with Ground: \n");
+  collision->getEntityB()->getAbsCoor().debug();
+
+  //collision->getEntityB()->setVelocity(Vector());
+  //collision->getEntityB()->setAbsCoor(this->lastPositions[5]);
 }
 

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -940 +940 @@
     // Return the normal here: Normal's stored in this->collPlane;
     if(collision ) {
-      PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
+//       PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
       worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
     }

branches/bsp_model/src/world_entities/space_ships/collision_probe.cc

@@ -45 +45 @@
 {
   this->init();
+
   if (root != NULL)
     this->loadParams(root);
-
 }
 
@@ -66 +66 @@
   this->loadMD2Texture("maps/dr_freak.pcx");
   this->loadModel("models/dr_freak.md2");
+
+  this->localVelocity = Vector(0,-4,0);
 }
 
@@ -97 +99 @@
   if( likely(this->getModel(0) != NULL))
     ((MD2Model*)this->getModel(0))->tick(time);
+
+  this->shiftCoor(this->localVelocity * time);
 }
+
 
 /**

branches/bsp_model/src/world_entities/space_ships/collision_probe.h

@@ -9 +9 @@
 #include "playable.h"
 
-class Vector;
-
+#include "vector.h"
 
 class CollisionProbe : public Playable
@@ -52 +51 @@
     int                   controlVelocityY;
 
+    Vector                localVelocity;      //!< velocity this entity flights with
 
 };

branches/bsp_model/src/world_entities/world_entity.cc

@@ -77 +77 @@
 
   // registering default reactions:
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND, CL_TERRAIN);
+//   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
   this->toList(OM_NULL);