Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/util/object_manager.cc

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

• orxonox/branches/physics/src/util/object_manager.cc (modified) (4 diffs)

orxonox/branches/physics/src/util/object_manager.cc

@@ -28 +28 @@
 ObjectManager::ObjectManager () 
 {
-  this->setClassName ("ObjectManager");
+  this->setClassID(CL_OBJECT_MANAGER, "ObjectManager");
   
-  //this->managedObjectList = new BaseObject*[CL_NUMBER];
   this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];
+  for(int i = 0; i < CL_NUMBER; ++i)
+    {
+      this->managedObjectList[i] = NULL;
+    }
 
   this->garbageCollector = GarbageCollector::getInstance();
 }
+
 
 /**
@@ -62 +66 @@
 
 
-void ObjectManager::cache(classList index, int number, const BaseObject &copyObject)
-{
-  //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));
-    }
-}
-
-
-void ObjectManager::addToDeadList(classList index, BaseObject* object)
+void ObjectManager::addToDeadList(int 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: no list initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
 }
 
 
-BaseObject* ObjectManager::getFromDeadList(classList index, int number)
+BaseObject* ObjectManager::getFromDeadList(int index, int number)
 {
   if( likely(this->managedObjectList[index] != NULL))
@@ -88 +81 @@
       BaseObject* obj = this->managedObjectList[index]->firstElement();
       this->managedObjectList[index]->remove(obj);
+      if( unlikely(obj == NULL))
+        {
+          PRINTF(0)("Critical: there was no object anymore in the dead list! This could result in Segfaults\n");
+        }
       return obj;
     }
   else
-    PRINTF(0)(" Error: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+  return NULL;
 }
 
@@ -102 +100 @@
   for(int i = 0; i < CL_NUMBER; ++i)
     {
-      if(this->managedObjectList[i] != NULL)
+      if( this->managedObjectList[i] != NULL)
         PRINT(0)("=   o Class Nr. %i has cached %i object(s)\n", i, this->managedObjectList[i]->getSize());
       else