Changeset 7932 in orxonox.OLD

Timestamp:

May 28, 2006, 9:00:40 PM (18 years ago)

Author:

patrick

Message:

cr: reaction subscription stuff

Location:

branches/cr/src

Files:

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

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

@@ -16 +16 @@
 
 #include "collision_handle.h"
+
+
+
 
 using namespace std;
@@ -41 +44 @@
   // delete what has to be deleted here
 }
+
+
+/**
+ * add more filter targets to this collision handle
+ *  @param classID the classid to look for
+ */
+void CollisionHandle::addTarget(long classID)
+{
+  // make sure there is no dublicate
+  std::vector<long>::iterator it;
+  for(  it = this->targetList.begin(); it != this->targetList.end(); it++)
+    if(*it == classID)
+      return;
+
+  // add element
+  this->targetList.push_back(classID);
+}

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

@@ -27 +27 @@
 
 
-  void addTarget();
+  void addTarget(long classID);
 
   void registerCollision(Collision* collision);

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

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

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

@@ -41 +41 @@
   inline static CREngine* getInstance(void) { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
-
-  CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...);
+  CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type);
 
   bool unsubscribeReaction(WorldEntity* worldEntity);
@@ -51 +50 @@
 
   /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */
-inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
+  inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }
   /** @param collision: returns the Collision object back to the cache list */
   inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); }

branches/cr/src/world_entities/world_entity.cc

@@ -69 +69 @@
 
   this->toList(OM_NULL);
-
-  //this->collisionHandles = new *CollisionHandle[CREngine::CR_NUMBER]();
 }
 
@@ -242 +240 @@
  */
 void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, ...)
-{}
+{
+
+  this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type);
+
+  va_list itemlist;
+  va_start (itemlist, CREngine::CRType);
+  for (int i = 0; i < nrOfTargets; i++)
+    this->collisionHandles[type].push_back(va_arg(itemlist, long));
+  va_end(itemlist);
+}
 
 

branches/cr/src/world_entities/world_entity.h

@@ -130 +130 @@
   bool                    bVisible;           //!< If it should be visible.
 
-  OM_LIST                           objectListNumber;   //!< The ObjectList from ObjectManager this Entity is in.
-  ObjectManager::EntityList::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
+  OM_LIST                           objectListNumber;             //!< The ObjectList from ObjectManager this Entity is in.
+  ObjectManager::EntityList::iterator objectListIterator;         //!< The iterator position of this Entity in the given list of the ObjectManager.
 
-  float                   scaling;
-  CollisionHandle**       collisionHandles;
+  float                   scaling;                                //!< the scaling of the model
+  CollisionHandle*        collisionHandles[CREngine::CR_NUMBER];  //!< the list of the collision reactions