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

Timestamp:

May 25, 2005, 11:59:21 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented the objectmanager cache function

Location:

orxonox/trunk/src/util

Files:

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

orxonox/trunk/src/util/object_manager.cc

@@ -17 +17 @@
 
 #include "object_manager.h"
+#include "list.h"
+#include "world_entity.h"
 
 using namespace std;
@@ -26 +28 @@
 ObjectManager::ObjectManager () 
 {
-   this->setClassName ("ObjectManager");
-
-  this->managedObjectList = new BaseObject*[CL_NUMBER];
+  this->setClassName ("ObjectManager");
+  
+  //this->managedObjectList = new BaseObject*[CL_NUMBER];
+  this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];
 }
 
@@ -57 +60 @@
 
 
-void ObjectManager::cache(classList index, int number)
+void ObjectManager::cache(classList index, int number, const BaseObject &copyObject)
 {
-  this->managedObjectList[index] = new BaseObject();
+  //this->managedObjectList[index] = new BaseObject[number];
+  this->managedObjectList[index] = new tList<BaseObject>();
+  for(int i = 0; i < number; ++i)
+    {
+      this->managedObjectList[index]->add(new BaseObject(copyObject));
+    }
 }
 

orxonox/trunk/src/util/object_manager.h

@@ -40 +40 @@
   virtual ~ObjectManager(void);
   
-  void cache(classList index, int number);
+  void cache(classList index, int number, const BaseObject &copyObject);
   void addToDeadList(const char* className, BaseObject* object);
   BaseObject* getFromDeadList(const char* className, int number = 1);
@@ -48 +48 @@
   static ObjectManager* singletonRef;
 
-  BaseObject** managedObjectList;
+  //BaseObject** managedObjectList;
+  tList<BaseObject>** managedObjectList;
 };