Changeset 7999 in orxonox.OLD

Timestamp:

May 30, 2006, 11:38:37 PM (18 years ago)

Author:

patrick

Message:

cr: collision/collision event creation and resycling works now

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (1 diff)
• cr_engine.cc (modified) (2 diffs)

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

@@ -60 +60 @@
 void CollisionHandle::addTarget(long target)
 {
-  PRINTF(0)("addTarget: %i \n", target);
   // make sure there is no dublicate
-//   for(int i = 0; i < this->targetList.size(); ++i)
-//     printf("id: %i\n", this->targetList[i]);
-
-//   std::vector<long>::iterator it = this->targetList.begin();
-//   for( ; it < this->targetList.end(); it++)
-//     printf("id: %i\n", *it);
-//     if( (*it) == classID)
-//       return;
-
+  std::vector<long>::iterator it = this->targetList.begin();
+  for( ; it < this->targetList.end(); it++)
+    if( (*it) == target)
+      return;
 
   // add element
-   this->targetList.push_back(10);
+   PRINTF(0)("addTarget: %i \n", target);
+   this->targetList.push_back(target);
 }
 

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

@@ -111 +111 @@
   CollisionHandle* ch = new CollisionHandle(owner, type);
   this->collisionHandles.push_back(ch);
+
+  return ch;
 }
 
@@ -157 +159 @@
 void CREngine::flushCollisions()
 {
-  vector<Collision*>::iterator it = this->collisionsUsed.begin();
-  for(; it < this->collisionsUsed.end(); it++)
-    this->collisionsUnused.push_back(*it);
+  vector<Collision*>::iterator it1 = this->collisionsUsed.begin();
+  for(; it1 < this->collisionsUsed.end(); it1++)
+    this->collisionsUnused.push_back(*it1);
+
+  vector<CollisionEvent*>::iterator it2 = this->collisionEventsUsed.begin();
+  for(; it2 < this->collisionEventsUsed.end(); it2++)
+    this->collisionEventsUnused.push_back(*it2);
 
   this->collisionsUsed.clear();