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

Timestamp:

Dec 4, 2006, 4:39:45 PM (17 years ago)

Author:

patrick

Message:

merged the temp branch

File:

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

branches/coll_rect.merge/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 Collision; }
 
 class BVTree;
@@ -30 +32 @@
 class AABBTreeNode;
 class Model;
-class CollisionHandle;
-class Collision;
-
-
-//class CharacterAttributes;
-
 
 
@@ -42 +38 @@
 {
   ObjectListDeclaration(WorldEntity);
+
 public:
   WorldEntity();
@@ -51 +48 @@
   void loadModel2(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
   void setModel(Model* model, unsigned int modelNumber = 0);
-Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
+  Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
@@ -74 +71 @@
   virtual void collidesWithGround(const Vector& feet, const Vector& ray_1, const Vector& ray_2);
 
-
   /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
@@ -81 +77 @@
   inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
+  virtual void hit(float damage, WorldEntity* killer);
+
+
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CREngine::CRType type);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
-  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4);
-
-  void unsubscribeReaction(CREngine::CRType 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 subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1);
+  void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2);
+  void subscribeReaction(CoRe::CREngine::ReactionType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+
+  void unsubscribeReaction(CoRe::CREngine::ReactionType type);
+  void unsubscribeReactions();
+
   /** @return true if there is at least on collision reaction subscribed */
-  inline bool isReactive() const { return this->bReactive; }
-
-  CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
+  inline bool isReactive() const { return this->_collisionFilter.isReactive(); }
+
+  /** @param worldEntity the world entity to be checked @returns true if there is a collisionreaction registered for the worldEntity */
+  inline bool isReactive( const WorldEntity& worldEntity) const { return this->_collisionFilter(worldEntity); }
+  /** @param worldEntity the world entity to be checked @param type special reaction type @returns true if collision reaction reg. */
+  inline bool isReactive( const WorldEntity& worldEntity, const CoRe::CREngine::ReactionType& type) const
+  { return this->_collisionFilter(worldEntity, type); }
+
+
+  const CoRe::CollisionFilter& getCollisionFilter(CoRe::CREngine::ReactionType type) const { return this->_collisionFilter; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
-  bool isOnGround() const { return this->bOnGround; }
+  bool isOnGround() const { return this->_bOnGround; }
   /** @param flag: marks if this entity is standing on ground */
-  void setOnGround(bool flag) { this->bOnGround = flag; }
-
-  virtual void hit(float damage, WorldEntity* killer);
+  void setOnGround(bool flag) { this->_bOnGround = flag; }
 
   virtual void destroy( WorldEntity* killer );
@@ -128 +128 @@
 
   void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
-void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
+  void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
 
 
   /* --- Character Attribute Block --- */
   /** @returns the scaling of the model */
-float getScaling(){return this->scaling;}
+  float getScaling(){return this->scaling;}
   /** @returns the damage dealt by this world entity */
   float getDamage() const { return this->damage; }
@@ -170 +170 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
-
-  //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+    //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+
+
 private:
   void updateHealthWidget();
+
 
 private:
@@ -195 +197 @@
   OM_LIST                 lastObjectListNumber;            //!< the last ObjectList from the ObjectManager this Entity was is in
 
-
-
+  /* collision reaction stuff */
+  CoRe::CollisionFilter   _collisionFilter;                //!< filter for collision event filtering (not every entity listens to all collisions)
+  bool                    _bOnGround;                      //!< flag true if the object is on the ground
+
+  PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
+
+  /* network help structures */
   float                   scaling;                         //!< model's scaling factor
   int                     scaling_handle;                  //!< handle for syncing var
@@ -212 +219 @@
   int                     healthMax_handle;
 
-  CollisionHandle*        collisionHandles[CREngine::CR_NUMBER];  //!< the list of the collision reactions
-  bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
-
-  PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
-  bool                    bOnGround;                       //!< true if this entity is standing on the ground
+
 
 protected: