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

Timestamp:

Oct 13, 2006, 3:57:44 PM (18 years ago)

Author:

patrick

Message:

added namspacing to collision reaction. now comes the harder part

Location:

branches/coll_rect/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• npcs/generic_npc.cc (modified) (1 diff)
• weapons/aiming_system.cc (modified) (1 diff)
• world_entity.cc (modified) (12 diffs)
• world_entity.h (modified) (3 diffs)

branches/coll_rect/src/world_entities/creatures/fps_player.cc

@@ -167 +167 @@
 
     //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::staticClassID());
+  this->subscribeReaction(CoRe::CREngine::CR_PHYSICS_FULL_WALK, BspEntity::staticClassID());
 
   this->initWeapon = false;

branches/coll_rect/src/world_entities/npcs/generic_npc.cc

@@ -96 +96 @@
 
   // collision reaction registration
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::staticClassID());
+  this->subscribeReaction(CoRe::CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::staticClassID());
 }
 

branches/coll_rect/src/world_entities/weapons/aiming_system.cc

@@ -61 +61 @@
 
   // registering default reactions:
-  this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
+  this->unsubscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE);
+  this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
 
   this->range = 1000.0f;

branches/coll_rect/src/world_entities/world_entity.cc

@@ -78 +78 @@
 
   // reset all collision handles to NULL == unsubscribed state
-  for(int i = 0; i < CREngine::CR_NUMBER; ++i)
+  for(int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
     this->collisionHandles[i] = NULL;
   this->bReactive = false;
@@ -84 +84 @@
 
   // registering default reactions:
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, /* WorldEntity::staticClassID(), */ Projectile::staticClassID());
+  this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, /* WorldEntity::staticClassID(), */ Projectile::staticClassID());
 
   this->toList(OM_NULL);
@@ -302 +302 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1)
+void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1)
 {
   this->subscribeReaction(type);
@@ -316 +316 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2)
+void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2)
 {
   this->subscribeReaction(type);
@@ -331 +331 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
+void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
 {
   this->subscribeReaction(type);
@@ -342 +342 @@
 
 
-/**
- * subscribes this world entity to a collision reaction
- *  @param type the type of reaction to subscribe to
- *  @param target1 a filter target (classID)
- */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4)
-{
-  this->subscribeReaction(type);
-
-  // add the target filter
-  this->collisionHandles[type]->addTarget(target1);
-  this->collisionHandles[type]->addTarget(target2);
-  this->collisionHandles[type]->addTarget(target3);
-  this->collisionHandles[type]->addTarget(target4);
-}
-
 
 /**
@@ -365 +349 @@
  *  @param ... the targets as classIDs
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type)
+void WorldEntity::subscribeReaction(CoRe::CREngine::CRType type)
 {
   if( this->collisionHandles[type] != NULL)
@@ -373 +357 @@
   }
 
-  this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type);
+  this->collisionHandles[type] = CoRe::CREngine::getInstance()->subscribeReaction(this, type);
 
   // now there is at least one collision reaction subscribed
@@ -384 +368 @@
  *  @param type the reaction to unsubscribe
  */
-void WorldEntity::unsubscribeReaction(CREngine::CRType type)
+void WorldEntity::unsubscribeReaction(CoRe::CREngine::CRType type)
 {
   if( this->collisionHandles[type] == NULL)
     return;
 
-  CREngine::getInstance()->unsubscribeReaction(this->collisionHandles[type]);
+  CoRe::CREngine::getInstance()->unsubscribeReaction(this->collisionHandles[type]);
   this->collisionHandles[type] = NULL;
 
   // check if there is still any handler registered
-  for(int i = 0; i < CREngine::CR_NUMBER; ++i)
+  for(int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
   {
     if( this->collisionHandles[i] != NULL)
@@ -410 +394 @@
 void WorldEntity::unsubscribeReaction()
 {
-  for( int i = 0; i < CREngine::CR_NUMBER; i++)
-    this->unsubscribeReaction((CREngine::CRType)i);
+  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; i++)
+    this->unsubscribeReaction((CoRe::CREngine::CRType)i);
 
   // there are no reactions subscribed from now on
@@ -433 +417 @@
 
   // get a collision event
-  CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
+  CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
   c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
 
-  for( int i = 0; i < CREngine::CR_NUMBER; ++i)
+  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
     if( this->collisionHandles[i] != NULL)
       this->collisionHandles[i]->registerCollisionEvent(c);
@@ -457 +441 @@
 
   // get a collision event
-  CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
+  CoRe::CollisionEvent* c = CoRe::CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
   c->collide(type, entity, groundEntity, normal, position, bInWall);
 
-  for( int i = 0; i < CREngine::CR_NUMBER; ++i)
+  for( int i = 0; i < CoRe::CREngine::CR_NUMBER; ++i)
     if( this->collisionHandles[i] != NULL)
       this->collisionHandles[i]->registerCollisionEvent(c);

branches/coll_rect/src/world_entities/world_entity.h

@@ -82 +82 @@
 
   /* --- 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 subscribeReaction(CoRe::CREngine::CRType type);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2);
+  void subscribeReaction(CoRe::CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+
+  void unsubscribeReaction(CoRe::CREngine::CRType type);
   void unsubscribeReaction();
 
@@ -96 +95 @@
   inline bool isReactive() const { return this->bReactive; }
 
-  CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
+  CoRe::CollisionHandle* getCollisionHandle(CoRe::CREngine::CRType type) const { return this->collisionHandles[type]; }
 
   /** @returns true if this entity is standing on ground (BSP model) */
@@ -212 +211 @@
   int                     healthMax_handle;
 
-  CollisionHandle*        collisionHandles[CREngine::CR_NUMBER];  //!< the list of the collision reactions
+  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
+
 
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity