Changeset 4935 in orxonox.OLD

Timestamp:

Jul 22, 2005, 7:05:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: FastFactory: now resurection works from within the baseclass.
This is a good thing, because soon, the GarbageCollector will be able to check in its Collected Entities

File:

• orxonox/trunk/src/util/object_manager.h (modified) (7 diffs)

orxonox/trunk/src/util/object_manager.h

@@ -34 +34 @@
 
 //! A struct, that holds Lists of Objects of a certain type.
-template <class T> struct FastObjectMember
-{
-  T*                      objectPointer;
-
-  FastObjectMember<T>*    next;
+struct FastObjectMember
+{
+  BaseObject*               objectPointer;
+
+  FastObjectMember*         next;
 };
 
@@ -81 +81 @@
     unsigned int          storedDeadObjects;    //!< How many dead objects are stored in this class
 
+    FastObjectMember*     deadList;             //!< A List of all stored dead Objects of this class.
+    FastObjectMember*     unusedContainers;     //!< This is a List of unused containers, that will be reused by kill.
+
   private:
     static FastFactory*   first;                //!< A pointer to the first FastFactory.
@@ -107 +110 @@
 
   private:
-    FastObjectMember<T>*     deadList;             //!< A List of all stored dead Objects of this class.
-    FastObjectMember<T>*     unusedContainers;     //!< This is a List of unused containers, that will be reused by kill.
-
 };
 
@@ -144 +144 @@
     T* tFastFactory<T>::fabricate()
 {
-  FastObjectMember<T>* tmpFirstDead = new FastObjectMember<T>;
-  tmpFirstDead->objectPointer = new T();
+  FastObjectMember* tmpFirstDead = new FastObjectMember;
+  T* fabricatedT = new T();
+  tmpFirstDead->objectPointer = fabricatedT;
   tmpFirstDead->next = this->deadList;
   ++this->storedDeadObjects;
 
   this->deadList = tmpFirstDead;
-  return tmpFirstDead->objectPointer;
+  return fabricatedT;
 }
 
@@ -178 +179 @@
   else
   {
-    FastObjectMember<T>* tmpC = deadList;
+    FastObjectMember* tmpC = deadList;
     this->deadList = this->deadList->next;
 
@@ -184 +185 @@
     this->unusedContainers = tmpC;
 
-    return tmpC->objectPointer;
+    return dynamic_cast<T*>(tmpC->objectPointer);
   }
 }
@@ -191 +192 @@
     void tFastFactory<T>::kill(T* object)
 {
-  FastObjectMember<T>* tmpC;
+  FastObjectMember* tmpC;
   if (unlikely(this->unusedContainers == NULL))
   {
-    tmpC = new FastObjectMember<T>;
+    tmpC = new FastObjectMember;
   }
   else