Changeset 9895 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/cr_engine.h

Timestamp:

Oct 19, 2006, 3:54:49 PM (18 years ago)

Author:

patrick

Message:

interface adjustements

File:

• branches/coll_rect/src/lib/collision_reaction/cr_engine.h (modified) (4 diffs)

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

@@ -21 +21 @@
 namespace CoRe
 {
-  class CollisionHandle;
   class Collision;
   class CollisionEvent;
@@ -61 +60 @@
 
 
-#define COLLISION_TYPE_AXIS_X      1
-#define COLLISION_TYPE_AXIS_X_NEG  2
-//!< the collision axis y collision event
-#define COLLISION_TYPE_AXIS_Y      3
-#define COLLISION_TYPE_AXIS_Y_NEG  4
-//!< the collision axis z collision event
-#define COLLISION_TYPE_AXIS_Z      5
-#define COLLISION_TYPE_AXIS_Z_NEG  6
-//!< the collision is a obb collision
-#define COLLISION_TYPE_OBB         8
-
     virtual ~CREngine(void);
 
@@ -77 +65 @@
     inline static CREngine* getInstance() { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
-    CollisionHandle* subscribeReaction(WorldEntity* worldEntity, ReactionType type);
-    bool unsubscribeReaction(CollisionHandle* collisionHandle);
+//     CollisionHandle* subscribeReaction(WorldEntity* worldEntity, ReactionType type);
+//     bool unsubscribeReaction(CollisionHandle* collisionHandle);
 
 
@@ -98 +86 @@
 
   private:
-    std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
+    //std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
 
     std::vector<Collision*>             collisionsUsed;           //!< a list of used, cached collisions