Changeset 4979 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Aug 10, 2005, 4:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Objects now get cleanly ereased.
This is a fix in the Weapon-class, that kills the Resurected Projectiles created for information-gathering

Location:

orxonox/trunk/src/util

Files:

• fast_factory.cc (modified) (5 diffs)
• fast_factory.h (modified) (1 diff)
• garbage_collector.cc (modified) (3 diffs)
• garbage_collector.h (modified) (2 diffs)

orxonox/trunk/src/util/fast_factory.cc

@@ -81 +81 @@
 }
 
-
 /**
  * searches for a FastFactory
@@ -135 +134 @@
   while (tmpFac != NULL)
   {
+    printf("DELETEING ALL OF %s\n",tmpFac->getName());
     tmpFac->flush(hardFLUSH);
     tmpFac = tmpFac->next;
@@ -140 +140 @@
 }
 
-
 /**
  * ereases all the remaining containers, without deleting the stored Objects inside of them.
@@ -152 +151 @@
     delMember = tmpMember;
     tmpMember = tmpMember->next;
-    if (unlikely(hardFLUSH == true))
+    if (hardFLUSH)
+    {
+      PRINTF(1)("COOL\n");
       delete delMember->objectPointer;
+    }
     delete delMember;
   }
@@ -267 +269 @@
       tmpFac = tmpFac->next;
     }
-
-  }
-}
+  }
+}

orxonox/trunk/src/util/fast_factory.h

@@ -15 +15 @@
  * afterwards one can just retrieve an Object form the Class with
  * this->bulletFactory->resurrect();  // this returns a BaseObject an Object of the class.
+ *
+ * The big difference to the FastFactory-class is, that this one is used more for the purpose
+ * of fast game-interaction than for loading. althought one can also load FastFactorized classes
+ * it is not the main topic.
  */
-
 
 #ifndef _FAST_FACTORY_H

orxonox/trunk/src/util/garbage_collector.cc

@@ -25 +25 @@
 
 using namespace std;
-
 
 GarbageCollector* GarbageCollector::singletonRef = 0;
@@ -119 +118 @@
 void GarbageCollector::update()
 {
-  if (this->time < this->delay)
-  {
-    return;
-  }
-  if (this->collectedObjects == NULL)
+  if (this->time < this->delay || this->collectedObjects == NULL)
     return;
   else
@@ -131 +126 @@
     while (tmpC != NULL)
     {
-      WorldEntity* entity = dynamic_cast<WorldEntity*>(tmpC->objectPointer);
+      //WorldEntity* entity = dynamic_cast<WorldEntity*>(tmpC->objectPointer);
       //State::getWorldEntityList()->remove(entity);
-      entity->remove();
-      FastFactory::kill(entity, true);
+      //entity->remove();
+      FastFactory::kill(tmpC->objectPointer, true);
 
       moveC = tmpC->next;

orxonox/trunk/src/util/garbage_collector.h

@@ -1 +1 @@
 /*!
  * @file garbage_collector.h
- * Definition of the proto class template, used quickly start work
- * @todo Example: this shows how to use simply add a Marker that here has to be done something.
- *
- *  The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
- *  It is an example for the CODING-CONVENTION, and a starting-point for every class.
  */
 
@@ -17 +12 @@
 //! this class maintains the garbage collection.
 /**
-   the class is been ticked by the world.cc and goes through the
-   world_entity list to clean out all unused entities.
+ * you can pass everything to this class that you want to be collected
+ * just use GarbageCollector->collect(POINTER); to pass a collectable to the GarbageCollector
+ * it will then be handled acording to the class
 */
 class GarbageCollector : public BaseObject {