Changeset 7927 in orxonox.OLD for trunk/src/lib

Timestamp:

May 28, 2006, 6:46:33 PM (19 years ago)

Author:

patrick

Message:

trunk: added more cr framework, i will branche soon with this stuff so the trunk dosn't get involved to much in the development phase

Location:

trunk/src/lib/collision_reaction

Files:

• Makefile.am (modified) (1 diff)
• collision_handle.cc (modified) (2 diffs)
• collision_handle.h (modified) (3 diffs)
• cr_engine.cc (modified) (1 diff)
• cr_engine.h (modified) (3 diffs)

trunk/src/lib/collision_reaction/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXcr.a
 
-libORXcr_a_SOURCES = cr_engine.cc
+libORXcr_a_SOURCES = cr_engine.cc \
+                     collision_handle.cc
 
 
 
-noinst_HEADERS =     cr_engine.h
+noinst_HEADERS =     cr_engine.h \
+                                                                                 collision_handle.h
 

trunk/src/lib/collision_reaction/collision_handle.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Patirick Boenzli
+   main-programmer: Patrick Boenzli
 */
 
@@ -24 +24 @@
  * @todo this constructor is not jet implemented - do it
 */
-CollisionHandle::CollisionHandle ()
+CollisionHandle::CollisionHandle (WorldEntity* owner, CREngine::CRType type)
 {
-   this->setClassID(CL_COLLISION_HANDLE, "CollisionHandle");
+  this->setClassID(CL_COLLISION_HANDLE, "CollisionHandle");
+
+  this->owner = owner;
+  this->type = type;
 
 }

trunk/src/lib/collision_reaction/collision_handle.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "cr_engine.h"
+
+#include <vector>
+
 
 class Collision;
+class WorldEntity;
+
+// struct CRType;
+
 
 //! A class for defining collision reactions and storing events
@@ -15 +23 @@
 
  public:
-  CollisionHandle();
+  CollisionHandle(WorldEntity* owner, CREngine::CRType type);
   virtual ~CollisionHandle();
+
+
+  void addTarget();
 
   void registerCollision(Collision* collision);
@@ -25 +36 @@
  private:
    WorldEntity*                  owner;                   //!< the worldenity this reaction will be applied on
-   classID                       targetClass;             //!< the entities triggering the handle
+   CREngine::CRType              type;                    //!< the reaction type
 
    bool                          bDispatched;             //!< true if this handle has already been dispatched
-   bool                          bStopOnFirstCollision    //!< true if the cd of this object should be terminated after one match
+   bool                          bStopOnFirstCollision;   //!< true if the cd of this object should be terminated after one match
 
    std::vector<Collision*>       collisionList;           //!< a list full of collisions
-   std::vector<classID>          targetList;              //!< a list of target classes for filtering
+   std::vector<long>             targetList;              //!< a list of target classes for filtering
 
 };

trunk/src/lib/collision_reaction/cr_engine.cc

@@ -47 +47 @@
 
 
-CollisionHandle* CREngine::subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...)
+CollisionHandle* CREngine::subscribeReaction(WorldEntity* owner, CRType type, int nrOfTargets, ...)
 {
+
   va_list itemlist;
   va_start (itemlist, type);
-  for (int i = 0; i < nrOfTargets; i++)
-    this->targetList.push_back(va_arg(itemlist, int));
+//  for (int i = 0; i < nrOfTargets; i++)
+  //  this->targetList.push_back(va_arg(itemlist, int));
   va_end(itemlist);
 }

trunk/src/lib/collision_reaction/cr_engine.h

@@ -20 +20 @@
 {
 
+  public:
   typedef enum CRType {
-    CR_CONSERVATION_OF_MOMENTUM   = 0,
+    CR_PHYSICS_MOMENTUM   = 0,
+    CR_PHYSICS_GROUND,
+    CR_PHYSICS_GROUND_WALK,
 
     CR_OBJECT_DAMAGE,
@@ -28 +31 @@
     CR_VERTEX_TRAFO,
 
-    CR_CALLBACK,
+    CR_SPECIAL_CALLBACK,
 
     CR_NUMBER
   };
 
+  virtual ~CREngine(void);
 
-public:
-  virtual ~CREngine(void);
   /** @returns a Pointer to the only object of this Class */
   inline static CREngine* getInstance(void) { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
@@ -57 +59 @@
   CREngine(void);
 
+
 private:
   std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
   std::vector<Collision*>             cachedCollisions;         //!< a list of unused, cached collision events
-  std::vector<int>                    targetList;
 
   static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)