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

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.h (modified) (1 diff)

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

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