Changeset 9939 in orxonox.OLD for branches/coll_rect/src/world_entities

Timestamp:

Nov 20, 2006, 12:53:27 AM (18 years ago)

Author:

patrick

Message:

removed some comilation problems.

File:

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

branches/coll_rect/src/world_entities/world_entity.h

@@ -88 +88 @@
   void unsubscribeReactions();
 
+  inline bool isSubscribed(CoRe::CREngine::ReactionType type) const { return this->_collisionFilter.isSubscribed( type); }
+
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
-
-  const CoRe::CollisionFilter& getCollisionFilter(CoRe::CREngine::ReactionType type) const { return this->collisionFilter; }
+  inline bool isReactive( const WorldEntity& worldEntity) const { return this->isReactive() || (this->_collisionFilter(worldEntity)); }
+
+  const CoRe::CollisionFilter& getCollisionFilter(CoRe::CREngine::ReactionType type) const { return this->_collisionFilter; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
@@ -191 +194 @@
 
   /* collision reaction stuff */
-  CoRe::CollisionFilter   collisionFilter;                 //!< filter for collision event filtering (not every entity listens to all collisions)
+  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