Changeset 7940 in orxonox.OLD

Timestamp:

May 28, 2006, 11:05:21 PM (18 years ago)

Author:

patrick

Message:

cr: init and reset phases

Location:

branches/cr/src/lib/collision_reaction

Files:

• Makefile.am (modified) (1 diff)
• collision.cc (modified) (3 diffs)
• collision.h (modified) (1 diff)
• cr_engine.cc (modified) (4 diffs)
• cr_engine.h (modified) (1 diff)

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

@@ -12 +12 @@
 noinst_HEADERS =     cr_engine.h \
                      collision.h \
-                     collision_handle.h
+                     collision_handle.h \
+                     cr_defs.h
 

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

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_REACTION
 
 #include "collision.h"
@@ -20 +20 @@
 using namespace std;
 
+#define NULL 0
 
 /**
@@ -26 +27 @@
 Collision::Collision ()
 {
+  this->entityA = NULL;
+  this->entityB = NULL;
+  this->bvA = NULL;
+  this->bvB = NULL;
 }
 

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

@@ -17 +17 @@
 
  public:
-  Collision();
+   Collision();
   virtual ~Collision();
 
+  /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
+  inline void collide(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
+  { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
+
+
+  /** @return Collision WorldEntity A */
+  inline const WorldEntity* getEntityA() const { return this->entityA; }
+  /** @return Collision WorldEntity B */
+  inline const WorldEntity* getEntityB() const { return this->entityB; }
+  /** @return Bounding Volume from EntityA */
+  inline const BoundingVolume* getBVA() const { return this->bvA; }
+  /** @return Bounding Volume from EntityB */
+  inline const BoundingVolume* getBVB() const { return this->bvB; }
 
 

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_REACTION
 
+
+
+#include "collision.h"
+#include "cr_defs.h"
+
 #include "cr_engine.h"
 
@@ -30 +35 @@
    this->setName("CREngine");
 
+   this->init();
 }
 
@@ -45 +51 @@
 }
 
+
+void CREngine::init()
+{
+  // create a list of Collision events (precaching)
+  Collision* collisions = new Collision[CR_MAX_COLLISIONS];
+  for( int i = 0; i < CR_MAX_COLLISIONS; i++)
+    this->cachedCollisions.push_back(collisions[i]);
+}
+
+
+void CREngine::reset()
+{}
 
 
@@ -74 +92 @@
 
 }
+

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

@@ -41 +41 @@
   inline static CREngine* getInstance() { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
+  void init();
+  void reset();
+
+
   CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type);