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

Timestamp:

May 27, 2005, 12:53:34 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now changed the orxonox baseobject to object id representation. this is much faster, but needs some care, when defining new classes

Location:

orxonox/trunk/src/util

Files:

• animation/animation_player.cc (modified) (1 diff)
• garbage_collector.cc (modified) (1 diff)
• loading/load_param.h (modified) (1 diff)
• object_manager.cc (modified) (2 diffs)
• resource_manager.cc (modified) (1 diff)
• track/track_manager.cc (modified) (1 diff)
• track/track_node.cc (modified) (1 diff)

orxonox/trunk/src/util/animation/animation_player.cc

@@ -28 +28 @@
 AnimationPlayer::AnimationPlayer () 
 {
-   this->setClassName ("AnimationPlayer");
+   this->setClassID(CL_ANIMATION_PLAYER);
 
    this->animationList = new tList<Animation>();

orxonox/trunk/src/util/garbage_collector.cc

@@ -38 +38 @@
 GarbageCollector::GarbageCollector () 
 {
-   this->setClassName ("GarbageCollection");
+   this->setClassID(CL_GARBAGE_COLLECTOR);
    this->time = 0;
    this->delay = 1.5f; /* clean up all 5.0 seconds */

orxonox/trunk/src/util/loading/load_param.h

@@ -180 +180 @@
   static LoadClassDescription* addClass(const char* className);
   LoadParamDescription* addParam(const char* paramName);
+  
 
   static void printAll(const char* fileName = NULL);

orxonox/trunk/src/util/object_manager.cc

@@ -29 +29 @@
 ObjectManager::ObjectManager () 
 {
-  this->setClassName ("ObjectManager");
+  this->setClassID(CL_OBJECT_MANAGER);
   
   this->managedObjectList = new tList<BaseObject>*[CL_NUMBER];
+  for(int i = 0; i < CL_NUMBER; ++i)
+    {
+      this->managedObjectList[i] = NULL;
+    }
 
   this->garbageCollector = GarbageCollector::getInstance();
@@ -91 +95 @@
   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

orxonox/trunk/src/util/resource_manager.cc

@@ -38 +38 @@
 ResourceManager::ResourceManager () 
 {
-   this->setClassName ("ResourceManager");
+   this->setClassID(CL_RESOURCE_MANAGER);
    this->dataDir = NULL;
    this->setDataDir("./");

orxonox/trunk/src/util/track/track_manager.cc

@@ -370 +370 @@
 TrackManager::TrackManager(void)
 {
-  this->setClassName("TrackManager");
+  this->setClassID(CL_TRACK_MANAGER);
+  
   
   TrackManager::singletonRef = this; // do this because otherwise the TrackNode cannot get The instance of the TrackManager

orxonox/trunk/src/util/track/track_node.cc

@@ -32 +32 @@
 TrackNode::TrackNode () 
 {
-  this->setClassName("TrackNode");
+  this->setClassID(CL_TRACK_NODE);
   this->setName("TrackNode"); /* absolete but still used... */