Changeset 9893 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_tube.cc

Timestamp:

Oct 19, 2006, 3:37:40 PM (18 years ago)

Author:

patrick

Message:

collision reactions now only registered with collision tube. no compile

File:

• branches/coll_rect/src/lib/collision_reaction/collision_tube.cc (modified) (2 diffs)

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

@@ -67 +67 @@
 
     // check if there is already a collision defined between these objects
-    if( collision->match(*entityA, *entityB))
+    if( !collision->match(*entityA, *entityB))
     {
-      CollisionEvent* collisionEvent = CREngine::getInstance()->popCollisionEventObject();
-      collisionEvent->collide( CREngine::CR_COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
-      collision->registerCollisionEvent( collisionEvent);
+      collision = CREngine::getInstance()->popCollisionObject();
+      collision->collide( entityA, entityB);
     }
+
+    // now register the new collision event
+    CollisionEvent* collisionEvent = CREngine::getInstance()->popCollisionEventObject();
+    collisionEvent->collide( CREngine::CR_COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
+    collision->registerCollisionEvent( collisionEvent);
   }
 
@@ -85 +89 @@
    * @param bInWall true if the entity is in the ground material
    */
-  void CollisionTube::registerCollisionEvent(int type, WorldEntity* entity, WorldEntity* groundEntity,
+  void CollisionTube::registerCollisionEvent(CREngine::CollisionType type, WorldEntity* entity, WorldEntity* groundEntity,
                               const Vector& normal, const Vector& position, bool bInWall)
   {
-    //
+    Collision* collision = this->_collisionList.back();
+
+    // check if there is already a collision defined between these objects
+    if( !collision->match(*entity, *groundEntity))
+    {
+      collision = CREngine::getInstance()->popCollisionObject();
+      collision->collide( entity, groundEntity);
+    }
+
+    // now register the new collision event
+    CollisionEvent* collisionEvent = CREngine::getInstance()->popCollisionEventObject();
+    collisionEvent->collide( type, entity, groundEntity, normal, position, bInWall);
+    collision->registerCollisionEvent( collisionEvent);
   }
+
+
+  /**
+   * checks if two objects are
+   */
+  bool CollisionTube::needCollisionChecking(const WorldEntity& entityA, const WorldEntity& entityB)
+  {
+    //if( !this->isReactive( entityA, entityB) )
+    //  return false;
+
+    //if( entityA->)
+
+  }
+
 
   /**