Changeset 4592 in orxonox.OLD for orxonox/trunk/src/util/garbage_collector.cc

Timestamp:

Jun 10, 2005, 7:17:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivations work.
now the only thing to do is specify all the classes, and DO it CLEAN.

@patrick: is it ok, how i treated your ObjectManager??

File:

• orxonox/trunk/src/util/garbage_collector.cc (modified) (5 diffs)

orxonox/trunk/src/util/garbage_collector.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -33 +33 @@
    \brief standard constructor
 */
-GarbageCollector::GarbageCollector () 
+GarbageCollector::GarbageCollector ()
 {
    this->setClassID(CL_GARBAGE_COLLECTOR, "GarbageCollector");
@@ -44 +44 @@
    \brief standard deconstructor
 */
-GarbageCollector::~GarbageCollector () 
+GarbageCollector::~GarbageCollector ()
 {
   // delete what has to be deleted here
@@ -52 +52 @@
    \brief this sets the collection delay
    \param delay: the delay
-   
+
    after this delay, the garbage collector starts its work and begins to collect unused object
    to delete them afterwards. only objects in the worldentity list from the world object are lookded
-   at. 
+   at.
 */
 void GarbageCollector::setCollectionDelay(float delay)
@@ -107 +107 @@
   tIterator<WorldEntity>* iterator = list->getIterator();
   WorldEntity* entity = iterator->nextElement();
-  while( entity != NULL) 
-    { 
+  while( entity != NULL)
+    {
       if( entity->isFinalized())
-        {
-          PRINTF(4)("= finalizing object\n");
-          ++counter;
-          
-          /* first remove out of entity list */
-          list->remove(entity);
-          /* second remove out of pnode tree */
-          entity->remove();
-          /* then finaly delete reference */
-          //delete entity;
-          ObjectManager::getInstance()->addToDeadList(entity->getClassID(), entity);
-        }
+        {
+          PRINTF(4)("= finalizing object\n");
+          ++counter;
+
+          /* first remove out of entity list */
+          list->remove(entity);
+          /* second remove out of pnode tree */
+          entity->remove();
+          /* then finaly delete reference */
+          //delete entity;
+          ObjectManager::getInstance()->addToDeadList(entity->getClassID() & CL_MASK_LOWLEVEL_CLASS, entity);
+        }
       entity = iterator->nextElement();
     }