Changeset 10007 in orxonox.OLD

Timestamp:

Dec 4, 2006, 3:55:03 PM (17 years ago)

Author:

patrick

Message:

cd with bsp model works again

Location:

branches/coll_rect/src

Files:

• lib/collision_reaction/collision_filter.cc (modified) (4 diffs)
• lib/collision_reaction/cr_engine.cc (modified) (2 diffs)
• lib/collision_reaction/cr_physics_full_walk.cc (modified) (2 diffs)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision_filter.cc

@@ -142 +142 @@
   bool CollisionFilter::operator()(const WorldEntity& entity) const
   {
-    PRINTF(0)("operator()(const WorldEntity& entity)\n");
+//     PRINTF(0)("operator()(const WorldEntity& entity)\n");
 
     // if there are no installed criterions just ommit and return
@@ -154 +154 @@
       for(; it != this->_filters[i].end(); it++ )
       {
-         PRINTF(0)("[%i] check %s is a %s?\n", i, entity.getClassName().c_str(), (*it).name().c_str());
+//          PRINTF(0)("[%i] check %s is a %s?\n", i, entity.getClassName().c_str(), (*it).name().c_str());
         if( unlikely(entity.isA(*it) ) )
           return true;
@@ -175 +175 @@
     assert(&entity != NULL);
 
-    PRINTF(0)("operator()(const WorldEntity& entity, const CREngine::ReactionType type)\n");
+//     PRINTF(0)("operator()(const WorldEntity& entity, const CREngine::ReactionType type)\n");
     // if there are no installed criterions just omit and return
     if( !this->isReactive())
@@ -185 +185 @@
     for(; it != this->_filters[type].end(); it++ )
     {
-       PRINTF(0)("size: %i - %s is a %s?\n", this->_filters[type].size(), entity.getClassName().c_str(), (*it).name().c_str());
+//        PRINTF(0)("size: %i - %s is a %s?\n", this->_filters[type].size(), entity.getClassName().c_str(), (*it).name().c_str());
       if( entity.isA(*it))
         return true;

branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

@@ -166 +166 @@
         assert((*ci)->getEntityA() != NULL && (*ci)->getEntityB() != NULL);
 
-        PRINTF(0)("CR CHECK: collision between: %s, %s\n", (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
+//         PRINTF(0)("CR CHECK: collision between: %s, %s\n", (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
 
         // check if entity A or B is subscibed for this event
@@ -173 +173 @@
         {
           this->_reactionList[i]->reactToCollision(*ci);
-          PRINTF(0)("react to %i\n", i);
+          PRINTF(0)("executing reaction: %s, between %s - %s\n", this->_reactionList[i]->getClassName().c_str(), (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
         }
       }

branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -61 +61 @@
   {
 
-    AABB* box = collision->getEntityB()->getModelAABB();
-    WorldEntity* entity = collision->getEntityB();
+    AABB* box = collision->getEntityA()->getModelAABB();
+    WorldEntity* entity = collision->getEntityA();
 
     if( box == NULL)
@@ -89 +89 @@
 
       // calculate the collision position
-      Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+      Vector collPos =  collision->getEntityA()->getAbsCoor()  + box->center - ce->getCollisionPosition();
 
       // test the 3 axis differently

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

@@ -64 +64 @@
   {
 
-    AABB* box = collision->getEntityB()->getModelAABB();
-    WorldEntity* entity = collision->getEntityB();
+    AABB* box = collision->getEntityA()->getModelAABB();
+    WorldEntity* entity = collision->getEntityA();
 
     if( box == NULL)
@@ -87 +87 @@
 
       // calculate the collision position
-      Vector collPos =  collision->getEntityB()->getAbsCoor()  + box->center - ce->getCollisionPosition();
+      Vector collPos =  collision->getEntityA()->getAbsCoor()  + box->center - ce->getCollisionPosition();
 
       // test the 3 axis differently

branches/coll_rect/src/world_entities/world_entity.cc

@@ -80 +80 @@
 
   // registering default reactions:
-  this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, /* WorldEntity::staticClassID(), */ Projectile::staticClassID());
+  this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, Projectile::staticClassID());
 
   this->toList(OM_NULL);