Changeset 3676 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 30, 2005, 5:42:02 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: debug-information for ResourceManager

Location:

orxonox/trunk/src

Files:

• lib/util/resource_manager.cc (modified) (4 diffs)
• lib/util/resource_manager.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (2 diffs)
• world_entities/projectile.h (modified) (2 diffs)

orxonox/trunk/src/lib/util/resource_manager.cc

@@ -217 +217 @@
           if(isFile(fullName))
             {
+              PRINTF(4)("Image %s resides to %s\n", fileName, fullName);
               tmpResource->pointer = new Texture(fullName);
             }
@@ -229 +230 @@
                   sprintf(imgName, "%s%s", tmpDir, fileName);
                   if(isFile(imgName))
-                    tmpResource->pointer = new Texture(imgName);
+                    {
+                      PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
+                      tmpResource->pointer = new Texture(imgName);
+                      delete []imgName;
+                      break;
+                    }
                   delete []imgName;
                   tmpDir = iterator->nextElement();
@@ -242 +248 @@
           PRINTF(1)("No type found for %s.\n   !!This should not happen unless the Type is not supported yet.!!\n", tmpResource->name);
           break;
-        }
-      
-      // checking if the File really exists.
-      if(!isFile(fullName))
-        {
-          PRINTF(2)("Sorry, %s is not a regular file.\n", fullName);
-          tmpResource->pointer = NULL;
         }
       this->resourceList->add(tmpResource);
@@ -413 +412 @@
     return false;
 }
+
+/**
+   \brief outputs debug information about the ResourceManager
+*/
+void ResourceManager::debug(void)
+{
+  PRINT(0)("=RM===================================\n");
+  PRINT(0)("= RESOURCE-MANAGER DEBUG INFORMATION =\n");
+  PRINT(0)("======================================\n");
+  // if it is not initialized
+  PRINT(0)(" Reference is: %p\n", ResourceManager::singletonRef);
+  PRINT(0)(" Data-Directory is: %s\n", this->dataDir);
+  PRINT(0)(" List of Image-Directories: ");
+  tIterator<char>* tmpIt = imageDirs->getIterator();
+  char* tmpDir = tmpIt->nextElement();
+  while(tmpDir)
+    {
+      PRINT(0)("%s ",tmpDir);
+      tmpDir = tmpIt->nextElement();
+    }
+  delete tmpIt;
+  PRINT(0)("\n");
+
+  PRINT(0)("List of all stored Resources:\n");
+  tIterator<Resource>* iterator = resourceList->getIterator();
+  Resource* enumRes = iterator->nextElement();
+  while (enumRes)
+    {
+      PRINT(0)("-----------------------------------------\n");
+      PRINT(0)("Name: %s; References: %d; Type:", enumRes->name, enumRes->count);
+      switch (enumRes->type)
+        {
+        case OBJ:
+          PRINT(0)("ObjectModel\n");
+          break;
+        case PRIM:
+          PRINT(0)("PrimitiveModel\n");
+          break;
+        case IMAGE:
+          PRINT(0)("ImageFile (Texture)\n");
+          break;
+        default:
+          PRINT(0)("SoundFile\n");
+          break;
+        }
+      PRINT(0)("gets deleted at ");
+      switch(enumRes->prio)
+        {
+        default:
+        case RP_NO:
+          PRINT(0)("first posibility (0)\n");
+          break;
+        case RP_LEVEL:
+          PRINT(0)("the end of the Level (1)\n");
+          break;
+        case RP_CAMPAIGN:
+          PRINT(0)("the end of the campaign (2)\n");
+          break;
+        case RP_GAME:
+          PRINT(0)("when leaving the game (3)\n");
+          break;
+        }
+      enumRes = iterator->nextElement();
+    }
+  delete iterator;
+
+
+
+  PRINT(0)("==================================RM==\n");
+}

orxonox/trunk/src/lib/util/resource_manager.h

@@ -63 +63 @@
   bool unload(Resource* resource, ResourcePriority = RP_NO);
   bool unloadAllByPriority(ResourcePriority prio);
+  void debug(void);
 
  private:
@@ -77 +78 @@
   
   bool isDir(const char* directory);
-  bool isFile(const char* directory);  
+  bool isFile(const char* directory);
+
 };
 

orxonox/trunk/src/orxonox.cc

@@ -331 +331 @@
   orx->start();
   
-  //  delete orx;
+  delete orx;
   
 }

orxonox/trunk/src/story_entities/world.cc

@@ -145 +145 @@
   cn->unbind(this->localPlayer);
   cn->reset();
+  ResourceManager::getInstance()->debug();
 
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);

orxonox/trunk/src/world_entities/projectile.cc

@@ -33 +33 @@
 Projectile::Projectile () : WorldEntity()
 {
-  this->model = (Model*)ResourceManager::getInstance()->load("cube", PRIM, RP_LEVEL);
-  //  this->projectileModel = new Primitive(P_SPHERE);
+  this->model = (Model*)ResourceManager::getInstance()->load("sphere", PRIM, RP_LEVEL);
   this->flightDirection = NULL;
   this->currentLifeTime = 0.0f;
@@ -138 +137 @@
   glMultMatrixf((float*)matrix);  
   this->model->draw();
-  //this->projectileModel->draw();
 
   glPopMatrix();

orxonox/trunk/src/world_entities/projectile.h

@@ -9 +9 @@
 #include "world_entity.h"
 
-class Primitive;
 class Vector;
 
@@ -32 +31 @@
  private:
   //physical attriutes like: force, speed, acceleration etc.
-  Primitive* projectileModel;          //!< this serves temporary as a plasma bullet
   float speed;                         //!< this is the speed of the projectile
   float currentLifeTime;               //!< this is the time, the projectile exists in this world (incremented by tick)