Changeset 9891 in orxonox.OLD

Timestamp:

Oct 14, 2006, 12:34:41 AM (18 years ago)

Author:

patrick

Message:

collision tube register collision events interface

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision.h (modified) (1 diff)
• collision_tube.cc (modified) (1 diff)
• collision_tube.h (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision.h

@@ -53 +53 @@
 
 
+    inline bool match(const WorldEntity& entityA, WorldEntity& entityB) const { return (this->entityA == &entityA && this->entityB == &entityB); }
     /** @returns true if this Collision has already been dispatched */
     inline bool isDispatched() { return this->bDispatched; }

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

@@ -52 +52 @@
   }
 
+
+  /**
+   * registers a new CollisionEvent
+   * @param entityA one collision object
+   * @param entityB the other collision objectName
+   * @param bvA bounding volume of object A
+   * @param bvB bounding volume of object B
+   *
+   * this function doesn't check if the entities in question actualy are registered for any collisions
+   */
+  void CollisionTube::registerCollisionEvent(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
+  {
+    Collision* collision = this->_collisionList.back();
+    if( collision->match(*entityA, *entityB))
+    {}
+  }
+
+
+  /**
+   * registers a new CollisionEvent, only used by ground to object collision (eg. bsp model)
+   * @param type type of collision as stated in cr_def.h
+   * @param entity the WorldEntity colliding with the ground
+   * @param groundEntity the WorldEntity representing the ground
+   * @param normal the normal vector for the ground (up) - not always specified
+   * @param position the position of the collision relative to the object center
+   * @param bInWall true if the entity is in the ground material
+   */
+  void CollisionTube::registerCollisionEvent(int type, WorldEntity* entity, WorldEntity* groundEntity,
+                              const Vector& normal, const Vector& position, bool bInWall)
+  {
+    //
+  }
+
+  /**
+   * handles all collisions in registered in this tube
+   */
+  void CollisionTube::handleCollisions()
+  {
+    //
+  }
+
+
 }
 

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

@@ -38 +38 @@
     { return (entityA.isReactive() && entityB.isReactive()); }
 
-    bool registerCollisionEvent(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-    bool registerCollisionEvent(int type, WorldEntity* entity, WorldEntity* groundEntity,
+    void registerCollisionEvent(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
+    void registerCollisionEvent(int type, WorldEntity* entity, WorldEntity* groundEntity,
                                 const Vector& normal, const Vector& position, bool bInWall = false);