Changeset 7989 in orxonox.OLD

Timestamp:

May 30, 2006, 7:23:23 PM (18 years ago)

Author:

patrick

Message:

cr: other interface, no stdarg

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (3 diffs)
• lib/collision_reaction/collision_handle.h (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/cr/src/lib/collision_reaction/collision_handle.cc

@@ -34 +34 @@
   this->owner = owner;
   this->type = type;
-
-  this->targetList.clear();
 }
 
@@ -60 +58 @@
  *  @param classID the classid to look for
  */
-void CollisionHandle::addTarget(long classID)
+void CollisionHandle::addTarget(long target)
 {
-  printf("addTarget: %i this is target nr %i\n", classID, this->targetList.size());
+  PRINTF(0)("addTarget: %i \n", target);
   // make sure there is no dublicate
 //   for(int i = 0; i < this->targetList.size(); ++i)
@@ -73 +71 @@
 //       return;
 
+
   // add element
-  this->targetList.push_back(classID);
+  this->targetList.push_back(target);
 }
 

branches/cr/src/lib/collision_reaction/collision_handle.h

@@ -11 +11 @@
 
 #include <vector>
+#include <list>
 
 
@@ -28 +29 @@
     void reset();
 
-    void addTarget(long classID);
+    void addTarget(long target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
     void registerCollisionEvent(CollisionEvent* collisionEvent);

branches/cr/src/world_entities/world_entity.cc

@@ -76 +76 @@
 
   // registering default reactions:
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, 1, CL_WORLD_ENTITY);
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND, 1, CL_TERRAIN);
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND, CL_TERRAIN);
 
   this->toList(OM_NULL);
@@ -249 +249 @@
  * 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, long target1)
+{
+  this->subscribeReaction(type);
+
+  // add the target filter
+  this->collisionHandles[type]->addTarget(target1);
+}
+
+
+/**
+ * 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, long target1, long target2)
+{
+  this->subscribeReaction(type);
+
+  // add the target filter
+  this->collisionHandles[type]->addTarget(target1);
+  this->collisionHandles[type]->addTarget(target2);
+}
+
+
+/**
+ * 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, long target1, long target2, long target3)
+{
+  this->subscribeReaction(type);
+
+  // add the target filter
+  this->collisionHandles[type]->addTarget(target1);
+  this->collisionHandles[type]->addTarget(target2);
+  this->collisionHandles[type]->addTarget(target3);
+}
+
+
+/**
+ * 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, long target1, long target2, long target3, long 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);
+}
+
+
+/**
+ * subscribes this world entity to a collision reaction
+ *  @param type the type of reaction to subscribe to
  *  @param nrOfTargets number of target filters
  *  @param ... the targets as classIDs
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, long target...)
+void WorldEntity::subscribeReaction(CREngine::CRType type)
 {
   if( this->collisionHandles[type] != NULL)  {
@@ -260 +322 @@
 
   this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type);
-
-  // add the target filter
-  va_list itemlist;
-  va_start (itemlist, target);
-  for (int i = 0; i < nrOfTargets; i++)
-    this->collisionHandles[type]->addTarget(va_arg(itemlist, long));
-  va_end(itemlist);
 
   // now there is at least one collision reaction subsribed

branches/cr/src/world_entities/world_entity.h

@@ -70 +70 @@
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CREngine::CRType type, int nrOfTargets, long target, ...);
+  void subscribeReaction(CREngine::CRType type);
+  void subscribeReaction(CREngine::CRType type, long target1);
+  void subscribeReaction(CREngine::CRType type, long target1, long target2);
+  void subscribeReaction(CREngine::CRType type, long target1, long target2, long target3);
+  void subscribeReaction(CREngine::CRType type, long target1, long target2, long target3, long target4);
+
   void unsubscribeReaction(CREngine::CRType type);
   void unsubscribeReaction();