Changeset 3677 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 30, 2005, 6:15:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: more output info, some fixes in resourceManager

Location:

orxonox/trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (2 diffs)
• lib/util/resource_manager.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)
• world_entities/primitive.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (2 diffs)
• world_entities/test_gun.cc (modified) (1 diff)
• world_entities/weapon.cc (modified) (1 diff)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -41 +41 @@
 {
    this->setClassName ("GLMenuImageScreen");
+   this->backMat = NULL;
 }
 
@@ -50 +51 @@
 GLMenuImageScreen::~GLMenuImageScreen() 
 {
-  if (backMat)
-    delete backMat;
+  if (this->backMat)
+    delete this->backMat;
 }
 

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

@@ -175 +175 @@
   // searching if the resource was loaded before.
   Resource* tmpResource = this->locateResourceByName(fileName);
-  if (!tmpResource) // if the resource was not loaded before.
+  if (tmpResource) // if the resource was not loaded before.
+    {
+      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
+      tmpResource->count++;
+      if(tmpResource->prio < prio)
+        tmpResource->prio = prio;
+    }
+  else
     {
       char* tmpDir;
@@ -252 +259 @@
       delete []fullName;
     }
-  else
-    {
-      PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
-      tmpResource->count++;
-      if(tmpResource->prio < prio)
-        tmpResource->prio = prio;
-    }
 
   return tmpResource->pointer;
@@ -330 +330 @@
     {
       if (enumRes->prio <= prio)
-        unload(enumRes, prio);
+        if (enumRes->count == 0)
+          unload(enumRes, prio);
+        else
+          PRINTF(2)("unable to unload %s because there are still %d references to it\n",
+                   enumRes->name, enumRes->count);
       //enumRes = resourceList->nextElement();
       enumRes = iterator->nextElement();

orxonox/trunk/src/story_entities/world.cc

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

orxonox/trunk/src/world_entities/primitive.cc

@@ -21 +21 @@
 #include "stdincl.h"
 #include "world_entity.h"
-#include "objModel.h"
+#include "model.h"
 #include "vector.h"
 

orxonox/trunk/src/world_entities/terrain.cc

@@ -17 +17 @@
 #include "terrain.h"
 #include "stdincl.h"
-#include "objModel.h"
+#include "model.h"
 #include "vector.h"
 #include "glincl.h"
@@ -45 +45 @@
   if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
     {
-      this->model = (OBJModel*)new OBJModel(fileName);
+      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_LEVEL);
     }
   else

orxonox/trunk/src/world_entities/test_gun.cc

@@ -25 +25 @@
 #include "stdincl.h"
 #include "world_entity.h"
-#include "objModel.h"
+#include "model.h"
 #include "projectile.h"
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
-#include "objModel.h"
+#include "model.h"
 #include "projectile.h"
 #include "list.h"