Changeset 4311 in orxonox.OLD for orxonox/trunk

Timestamp:

May 26, 2005, 11:03:31 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: f*g object manager is hard to get done right, trying it differently

Location:

orxonox/trunk/src

Files:

• class_list.h (deleted)
• util/garbage_collector.cc (modified) (2 diffs)
• util/object_manager.cc (modified) (3 diffs)
• util/object_manager.h (modified) (3 diffs)
• world_entities/test_gun.cc (modified) (2 diffs)

orxonox/trunk/src/util/garbage_collector.cc

@@ -140 +140 @@
           //delete entity;
           ObjectManager::getInstance()->addToDeadList(CL_TEST_BULLET, entity);
-          ObjectManager::getInstance()->debug();
         }
       entity = iterator->nextElement();
@@ -148 +147 @@
   PRINTF(3)("=============================\n");
 
+  ObjectManager::getInstance()->debug();
+
   /* reset time to count again up to this->delay */
   this->time = 0;

orxonox/trunk/src/util/object_manager.cc

@@ -19 +19 @@
 #include "list.h"
 
+#include "projectile.h"
 
 using namespace std;
@@ -62 +63 @@
 
 
-void ObjectManager::cache(classList index, int number, const BaseObject &copyObject)
+void ObjectManager::cache(classList index, int number, Projectile* copyObject)
 {
   //this->managedObjectList[index] = new BaseObject[number];
@@ -68 +69 @@
   for(int i = 0; i < number; ++i)
     {
-      this->managedObjectList[index]->add(new BaseObject(copyObject));
+      this->managedObjectList[index]->add(new Projectile(*copyObject));
     }
 }

orxonox/trunk/src/util/object_manager.h

@@ -18 +18 @@
 #define OM_
 
-#include "class_list.h"
+
+//! list of all classes to be loadable in via the ObjectManager
+typedef enum classList 
+{
+  CL_PROJECTILE,
+  CL_TEST_BULLET,
+
+  CL_NUMBER
+};
+  
+
+
 
 
 class WorldEntity;
 class GarbageCollector;
-
+class Projectile;
 
 template<class T> class tList; 
 template<class T> class ManagedObject;
+
+#define mCache( Class ) \
+ cache(classList index, int number, Class * copyObject)
+
+
 
 //! the object manager itself
@@ -35 +51 @@
   virtual ~ObjectManager(void);
   
-  void cache(classList index, int number, const BaseObject &copyObject);
+
+  void mCache(Projectile);
+
   void addToDeadList(classList index, BaseObject* object);
   BaseObject* getFromDeadList(classList index, int number = 1);
+
+
 
   void debug();
@@ -43 +63 @@
  private:
   ObjectManager(void);
+  //void cache(classList index, int number, Projectile* copyObject);
+
   static ObjectManager* singletonRef;
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -89 +89 @@
     }
 
-  BaseObject* p = new TestBullet(this);
-  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, *p);
+  Projectile* p = new TestBullet(this);
+  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
   ObjectManager::getInstance()->debug();
 }
@@ -143 +143 @@
     }
 
-  Projectile* pj = new TestBullet(this);
+  Projectile* pj = (TestBullet*)ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET);
+
+  //printf( "object ref %p\n", ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
+
+  //Projectile* pj = new TestBullet(this);
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());