Changeset 4937 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: FastFactory: some more movement to the BaseClass. Now it is almost where i want it
doxygen tags will follow at 2 o'Clock in the morning …

Location:

orxonox/trunk/src/util

Files:

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

orxonox/trunk/src/util/object_manager.cc

@@ -36 +36 @@
   this->storedClassID = classID;
   this->next = NULL;
+
+  this->deadList = NULL;
+  this->unusedContainers = NULL;
 
   this->storedDeadObjects = 0;
@@ -139 +142 @@
 
 
+void FastFactory::prepare(unsigned int count)
+{
+/*  if (this->storedDeadObjects + this->storedLivingObjects >= count)
+  {
+  PRINTF(3)("not creating new Objects for class %s, because the requested count already exists\n", this->getClassName());
+}*/
+  for (int i = this->storedDeadObjects; i < count; i++)
+  {
+    this->fabricate();
+  }
+}
+
+
 BaseObject* FastFactory::resurect(ClassID classID)
 {

orxonox/trunk/src/util/object_manager.h

@@ -57 +57 @@
 
     virtual void fabricate() = NULL;
+    void prepare(unsigned int count);
     // retrival functions for fast Ineraction
     //FastFactory* getFastFactory(ClassID classID);
@@ -103 +104 @@
     static tFastFactory<T>* getFastFactory(ClassID classID, const char* fastFactoryName = NULL);
 
-    void prepare(unsigned int count);
-
     T* resurect();
   private:
@@ -123 +122 @@
   : FastFactory(classID, fastFactoryName)
 {
-  PRINTF(5)("Class: %s loadable as a FastFactory\n", this->getName());
-
-  this->deadList = NULL;
-  this->unusedContainers = NULL;
 }
 
@@ -152 +147 @@
 
   this->deadList = tmpFirstDead;
-}
-
-template<class T>
-    void tFastFactory<T>::prepare(unsigned int count)
-{
-/*  if (this->storedDeadObjects + this->storedLivingObjects >= count)
-  {
-    PRINTF(3)("not creating new Objects for class %s, because the requested count already exists\n", this->getClassName());
-  }*/
-  for (int i = this->storedDeadObjects; i < count; i++)
-  {
-    this->fabricate();
-  }
 }