Changeset 9869 in orxonox.OLD for trunk/src/lib/collision_reaction/collision_handle.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/collision_reaction/collision_handle.cc (modified) (7 diffs)

trunk/src/lib/collision_reaction/collision_handle.cc

@@ -30 +30 @@
 
 
-
+ObjectListDefinition(CollisionHandle);
 
 /**
@@ -38 +38 @@
 CollisionHandle::CollisionHandle (WorldEntity* owner, CREngine::CRType type)
 {
-  this->setClassID(CL_COLLISION_HANDLE, "CollisionHandle");
+  this->registerObject(this, CollisionHandle::_objectList);
 
   this->owner = owner;
@@ -94 +94 @@
  *  @param classID the classid to look for
  */
-void CollisionHandle::addTarget(long target)
+void CollisionHandle::addTarget(const ClassID& target)
 {
   // make sure there is no dublicate
-  std::vector<long>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for( ; it < this->targetList.end(); it++)
     if( (*it) == target)
       return;
 
+
   // add element
-   PRINTF(5)("addTarget: %i \n", target);
-
-   this->targetList.push_back(target);
+  this->targetList.push_back(target);
+   PRINTF(5)("addTarget: %i \n", target.id());
 }
 
@@ -227 +227 @@
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
 {
-  std::vector<long>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
@@ -253 +253 @@
 
     if( collisionEvent->getEntityA() == this->owner) {
-      if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
+      if( collisionEvent->getEntityB()->isA((*it))) {
         PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-                  collisionEvent->getEntityB()->getClassCName(), *it);
+        collisionEvent->getEntityB()->getClassCName(), (*it).id());
         return true; }
     }
     else {
-      if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
+      if( collisionEvent->getEntityA()->isA((*it))) {
         PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassCName(),
-                  collisionEvent->getEntityA()->getClassCName(), *it);
+        collisionEvent->getEntityA()->getClassCName(), (*it).id());
       return true; }
     }
@@ -276 +276 @@
 bool CollisionHandle::filterCollision(Collision* collision)
 {
-  std::vector<long>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
@@ -302 +302 @@
 
     if( collision->getEntityA() == this->owner) {
-      if( collision->getEntityA()->isA((ClassID)(*it)))
+      if( collision->getEntityA()->isA(*it))
         return true; }
       else {
-        if( collision->getEntityB()->isA((ClassID)(*it)))
+        if( collision->getEntityB()->isA(*it))
           return true; }
   }