Changeset 7841 in orxonox.OLD for trunk/src

Timestamp:

May 24, 2006, 11:07:38 PM (19 years ago)

Author:

patrick

Message:

trunk: collision handle introduced and other stuff

Location:

trunk/src

Files:

• lib/collision_reaction/collision_handle.cc (added)
• lib/collision_reaction/collision_handle.h (added)
• lib/collision_reaction/cr_engine.cc (modified) (1 diff)
• lib/collision_reaction/cr_engine.h (modified) (2 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)

trunk/src/lib/collision_reaction/cr_engine.cc

@@ -43 +43 @@
   CREngine::singletonRef = NULL;
 }
+
+
+
+CollisionHandle* CREngine::subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...)
+{
+#if 0
+  va_list itemlist;
+  va_start (itemlist, type);
+  for (int i = 0; i < faceElemCount; i++)
+    this->targetList.push_back(va_arg(itemlist, int));
+  va_end(itemlist);
+#endif
+}
+
+
+

trunk/src/lib/collision_reaction/cr_engine.h

@@ -36 +36 @@
   inline static CREngine* getInstance(void) { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
-
-  CollisionHandle* subscribeReaction(WorldEntity* worldEntity, ClassId targets, CRType type);
+#if 0
+  CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...);
 
   bool unsubscribeReaction(WorldEntity* worldEntity);
   bool unsubscribeReaction(CollisionHandle* collisionHandle);
 
+
+  void handleCollisions();
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
@@ -55 +57 @@
   std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
   std::vector<Collision*>             cachedCollisions;         //!< a list of unused, cached collision events
+#endif
 };
 

trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: Benjamin Grauer
-   co-programmer: ...
+   co-programmer: Patrick Boenzli
 
    this file extends the framework file, so it renders what i want.