Changeset 9869 in orxonox.OLD for trunk/src/lib/collision_detection/cd_engine.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_detection/cd_engine.cc (modified) (3 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -20 +20 @@
 #include "debug.h"
 
-#include "class_list.h"
-
 #include "model.h"
 #include "world_entity.h"
@@ -36 +34 @@
 
 
-
+ObjectListDefinition(CDEngine);
 /**
- *  standard constructor
+ * @brief standard constructor
  */
 CDEngine::CDEngine ()
 {
-  this->setClassID(CL_CD_ENGINE, "CDEngine");
+  this->registerObject(this, CDEngine::_objectList);
 
   this->bAbordOnFirstCollision = false;
@@ -103 +101 @@
 void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
-
-  std::list<BaseObject*>::const_iterator bspIterator;
   std::list<WorldEntity*>::iterator entityIterator;
-  const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_ENTITY);
-  if( bspList == NULL)
-    return;
-
   // for all bsp managers check all entities
-  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
+  for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
+       bspIterator != BspEntity::objectList().end();
+       bspIterator++) {
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
       {