Changeset 7933 in orxonox.OLD for branches/cr

Timestamp:

May 28, 2006, 9:37:55 PM (19 years ago)

Author:

patrick

Message:

cr: more registration framework

Location:

branches/cr/src

Files:

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

branches/cr/src/lib/collision_reaction/Makefile.am

@@ -10 +10 @@
 
 noinst_HEADERS =     cr_engine.h \
-                                                                                 collision_handle.h
+                     collision_handle.h
 

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

@@ -61 +61 @@
   this->targetList.push_back(classID);
 }
+
+
+/**
+ * this is the function to be called on a collision event for this handle
+ *  @param collision the collision objects containing all collision informations
+ */
+void CollisionHandle::registerCollision(Collision* collision)
+{
+  this->collisionList.push_back(collision);
+}
+
+

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

@@ -55 +55 @@
 
 
+void CREngine::debug()
+{
+
+}

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

@@ -55 +55 @@
 
 
+  void debug();
+
 private:
   CREngine(void);

branches/cr/src/world_entities/world_entity.cc

@@ -34 +34 @@
 #include "cr_engine.h"
 #include "collision_handle.h"
+
+#include <stdarg.h>
 
 
@@ -239 +241 @@
  *  @param ... the targets as classIDs
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, ...)
+void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, long target...)
 {
 
@@ -245 +247 @@
 
   va_list itemlist;
-  va_start (itemlist, CREngine::CRType);
+  va_start (itemlist, target);
   for (int i = 0; i < nrOfTargets; i++)
-    this->collisionHandles[type].push_back(va_arg(itemlist, long));
+    this->collisionHandles[type]->addTarget(va_arg(itemlist, long));
   va_end(itemlist);
 }

branches/cr/src/world_entities/world_entity.h

@@ -15 +15 @@
 #include "glincl.h"
 #include <vector>
-#include <stdarg.h>
+
 
 
@@ -68 +68 @@
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CREngine::CRType type, int nrOfTargets, ...);
+  void subscribeReaction(CREngine::CRType type, int nrOfTargets, long target, ...);