Changeset 9896 in orxonox.OLD for branches/coll_rect/src/world_entities/world_entity.h

Timestamp:

Oct 20, 2006, 1:09:03 AM (18 years ago)

Author:

patrick

Message:

more design, thinner interface

File:

• branches/coll_rect/src/world_entities/world_entity.h (modified) (6 diffs)

branches/coll_rect/src/world_entities/world_entity.h

@@ -12 +12 @@
 
 #include "cr_engine.h"
+#include "collision_filter.h"
 #include "object_manager.h"
 #include "glincl.h"
@@ -25 +26 @@
 namespace OrxSound { class SoundBuffer; class SoundSource; }
 namespace OrxGui { class GLGuiWidget; class GLGuiBar; class GLGuiEnergyWidget; };
-namespace CoRe { class CollisionHandle; class Collision; }
+namespace CoRe { class Collision; }
 
 class BVTree;
@@ -76 +77 @@
   inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
+  virtual void hit(float damage, WorldEntity* killer);
+
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CoRe::CREngine::ReactionType type);
   void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1);
   void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2);
@@ -84 +86 @@
 
   void unsubscribeReaction(CoRe::CREngine::ReactionType type);
-  void unsubscribeReaction();
-
-  bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
+  void unsubscribeReactions();
+
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
 
-  CoRe::CollisionHandle* getCollisionHandle(CoRe::CREngine::ReactionType type) const { return this->collisionHandles[type]; }
+  const CoRe::CollisionFilter& getCollisionFilter(CoRe::CREngine::ReactionType type) const { return this->collisionFilter; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
@@ -97 +97 @@
   /** @param flag: marks if this entity is standing on ground */
   void setOnGround(bool flag) { this->bOnGround = flag; }
-
-  virtual void hit(float damage, WorldEntity* killer);
 
   virtual void destroy( WorldEntity* killer );
@@ -193 +191 @@
 
   /* collision reaction stuff */
-  CoRe::CollisionHandle*  collisionHandles[CoRe::CREngine::CR_NUMBER];  //!< the list of the collision reactions
-  bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
+  CoRe::CollisionFilter   collisionFilter;                 //!< filter for collision event filtering (not every entity listens to all collisions)
+  bool                    bReactive;                       //!< true if there is at least one collision reaction subscibed