Changeset 7937 in orxonox.OLD for branches/cr/src

Timestamp:

May 28, 2006, 10:31:29 PM (18 years ago)

Author:

patrick

Message:

cr: some more functions prototypes and interface ext

Location:

branches/cr/src

Files:

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

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

@@ -25 +25 @@
  */
 CREngine::CREngine ()
+  : BaseObject()
 {
    this->setClassID(CL_CR_ENGINE, "CREngine");
@@ -46 +47 @@
 
 
-
+/**
+ * subscribes a WorldEntity for a CollisionReaction
+ *  @param owner: the WE to subscribe
+ *  @param type: the type of collision reaction to perform
+ */
 CollisionHandle* CREngine::subscribeReaction(WorldEntity* owner, CRType type)
 {
@@ -52 +57 @@
 }
 
+bool CREngine::unsubscribeReaction(WorldEntity* worldEntity)
+{}
+
+
+bool CREngine::unsubscribeReaction(CollisionHandle* collisionHandle)
+{}
+
+
+void CREngine::handleCollisions()
+{}
 
 

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

@@ -8 +8 @@
 
 #include "base_object.h"
-#include <stdarg.h>
+
 #include <vector>
 
@@ -39 +39 @@
 
   /** @returns a Pointer to the only object of this Class */
-  inline static CREngine* getInstance(void) { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
+  inline static CREngine* getInstance() { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
   CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type);
@@ -58 +58 @@
 
 private:
-  CREngine(void);
+  CREngine();
 
 

branches/cr/src/world_entities/world_entity.cc

@@ -32 +32 @@
 #include "camera.h"
 
-#include "cr_engine.h"
 #include "collision_handle.h"