Changeset 4939 in orxonox.OLD for orxonox/trunk

Timestamp:

Jul 23, 2005, 12:15:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the garbage collector should be ready to store the Objects

Location:

orxonox/trunk/src/util

Files:

• object_manager.cc (modified) (2 diffs)
• object_manager.h (modified) (5 diffs)

orxonox/trunk/src/util/object_manager.cc

@@ -211 +211 @@
  * kills Object object, meaning, that it will be stored in the deadList of the FastFactory, and waiting for resurrection
  * @param object the Object to kill.
+ *
+ * synony that would be really grate would be abolish, but this is more like exterminate than pause-mode.
  */
 void FastFactory::kill(BaseObject* object)
@@ -231 +233 @@
 
 
-void FastFactory::kill(BaseObject* object, ClassID classID)
-{
-
-
+void FastFactory::kill(BaseObject* object, bool searchForFastFactory)
+{
+  if (likely(searchForFastFactory == true))
+  {
+    FastFactory* tmpFac = FastFactory::first;
+    while (tmpFac != NULL)
+    {
+      if (object->isA(tmpFac->storedClassID))
+      {
+        tmpFac->kill(object);
+        return;
+      }
+      tmpFac = tmpFac->next;
+    }
+
+  }
 }
 

orxonox/trunk/src/util/object_manager.h

@@ -60 +60 @@
     static BaseObject* resurrect(ClassID classID);
     void kill(BaseObject* object);
-    static void kill(BaseObject* object, ClassID classID);
+    static void kill(BaseObject* object, bool searchForFastFactory);
 
     void prepare(unsigned int count);
@@ -80 +80 @@
     FastFactory* getNext() const { return this->next; };
 
-//    virtual BaseObject* fabricate(ClassID classID) = NULL;
+    /** generates a new Object of the Class T */
     virtual void fabricate() = NULL;
     static FastFactory* searchFastFactory(ClassID classID, const char* fastFactoryName = NULL);
@@ -119 +119 @@
  * @param fastFactoryName the name of the FastFactory
  * @param fastFactory the ID of the class
+ * @todo (can this be written in another form??)
  */
 template<class T>
@@ -126 +127 @@
 }
 
+/**
+ * creates (if not existent) a Factory of Class T, and assigns some values to it
+ * @param classID the ClassID to assign to this class
+ * @param fastFactoryName the name to assign
+ * @returns The FastFactory if existent a new Factory if not.
+ */
 template<class T>
     tFastFactory<T>* tFastFactory<T>::getFastFactory(ClassID classID, const char* fastFactoryName)
@@ -140 +147 @@
 
 
+/**
+ * fabricates an Object of Class T, that corresponds to classID.
+ */
 template<class T>
     void tFastFactory<T>::fabricate()