Changeset 10013 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Dec 4, 2006, 6:42:46 PM (18 years ago)

Author:

patrick

Message:

merged the collision reaction branche back to trunk

File:

• trunk/src/lib/graphics/importer/bsp_manager.cc (modified) (7 diffs)

trunk/src/lib/graphics/importer/bsp_manager.cc

@@ -46 +46 @@
 
 #include "aabb.h"
-#include "cr_defs.h"
+#include "cr_engine.h"
+#include "collision_tube.h"
 
 
@@ -1215 +1216 @@
   if( xCollisionForward)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_X ,
-                              this->parent, entity,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_X ,
+                              entity, this->parent,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos,
@@ -1254 +1255 @@
   if( xCollisionBackward)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_X_NEG ,
-                              this->parent, entity,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_X_NEG,
+                              entity, this->parent,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos,
@@ -1350 +1351 @@
   if( yCollisionUp)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent,
-                              entity,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Y,
+                              entity, this->parent,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos, SolidFlag);
@@ -1403 +1404 @@
   if( yCollisionDown)
   {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Y_NEG , this->parent,
-                              entity,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Y_NEG ,
+                              entity, this->parent,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos, SolidFlag);
   }
-
-
 }
 
@@ -1484 +1483 @@
 
   if( zCollisionRight) {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent,
-                              entity,
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z ,
+                              entity, this->parent,
                               Vector(testPlane->x, testPlane->y, testPlane->z),
                               collPos , SolidFlag);
@@ -1523 +1522 @@
 
   if( zCollisionLeft) {
-    entity->registerCollision(COLLISION_TYPE_AXIS_Z_NEG , this->parent,
-                              entity,
-                              Vector(testPlane->x, testPlane->y, testPlane->z),
-                              collPos , SolidFlag);
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z_NEG ,
+                               entity, this->parent,
+                               Vector(testPlane->x, testPlane->y, testPlane->z),
+                               collPos , SolidFlag);
   }