Changeset 4288 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 26, 2005, 12:38:44 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implementing the add/get from DeadList functions, resturctured the garbage collector hirarchy

Location:

orxonox/trunk/src/util

Files:

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

orxonox/trunk/src/util/object_manager.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
 */
 
@@ -17 +16 @@
 
 #include "object_manager.h"
+#include "garbage_collector.h"
 #include "list.h"
-#include "world_entity.h"
+
 
 using namespace std;
@@ -32 +32 @@
   //this->managedObjectList = new BaseObject*[CL_NUMBER];
   this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];
+
+  this->garbageCollector = GarbageCollector::getInstance();
 }
 
@@ -71 +73 @@
 
 
-void ObjectManager::addToDeadList(const char* className, BaseObject* object)
-{}
+void ObjectManager::addToDeadList(classList index, BaseObject* object)
+{
+  if( likely(this->managedObjectList[index] != NULL))
+    this->managedObjectList[index]->add(object);
+  else
+    PRINTF(0)(" Error: unable to add object to the list nr. %i, ignoring\n", index);
+}
 
 
-BaseObject* ObjectManager::getFromDeadList(const char* className, int number)
+BaseObject* ObjectManager::getFromDeadList(classList index, int number)
 {}
 

orxonox/trunk/src/util/object_manager.h

@@ -18 +18 @@
 #define OM_
 
-class WorldEntity;
+#include "class_list.h"
 
 
-//! list of classes able to be loaded via the object manager
-struct classListElement
-{
-  char* name;
-};
-#include "class_list.h"
-
+class WorldEntity;
+class GarbageCollector;
 
 
@@ -41 +36 @@
   
   void cache(classList index, int number, const BaseObject &copyObject);
-  void addToDeadList(const char* className, BaseObject* object);
-  BaseObject* getFromDeadList(const char* className, int number = 1);
+  void addToDeadList(classList index, BaseObject* object);
+  BaseObject* getFromDeadList(classList index, int number = 1);
 
   void debug();
@@ -52 +47 @@
   //BaseObject** managedObjectList;
   tList<BaseObject>** managedObjectList;
+  GarbageCollector* garbageCollector;
 };
 
 
-template<class T> class ManagedObject
-{
- public:
-  const char* className;
-  tList<T>* objectList;
-};
-
-#define createClassFromName(className)
-
 
 #endif /* _OBJECT_MANAGER_H */