Changeset 5303 in orxonox.OLD

Timestamp:

Oct 7, 2005, 2:42:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: less output on quit… still some strange effecs caused by unloading textures

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (3 diffs)
• orxonox.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/material.cc

@@ -36 +36 @@
 Material::Material (const char* mtlName)
 {
-  PRINTF(4)("initializing new Material.\n");
+  this->setClassID(CL_MATERIAL, "Material");
+
   this->setIllum(3);
   this->setDiffuse(0,0,0);
@@ -58 +59 @@
   PRINTF(4)("delete Material %s.\n", this->getName());
 
-  if (this->diffuseTexture)
+  if (this->diffuseTexture != NULL)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
-  if (this->ambientTexture)
+  if (this->ambientTexture != NULL)
     ResourceManager::getInstance()->unload(this->ambientTexture);
-  if (this->specularTexture)
+  if (this->specularTexture != NULL)
     ResourceManager::getInstance()->unload(this->specularTexture);
 }
@@ -275 +276 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap!= NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME);
   else
     this->diffuseTexture = NULL;

trunk/src/orxonox.cc

@@ -21 +21 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-co-programmer: Christian Meyer
+   co-programmer: Christian Meyer
    co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ORXONOX
 #include "orxonox.h"
 

trunk/src/util/resource_manager.cc

@@ -71 +71 @@
   // deleting the Resources-List
   this->unloadAllByPriority(RP_GAME);
+
+  if (this->resourceList->getSize() > 0)
+    PRINTF(1)("Not removed all Textures, since there are still %d resources registered\n", this->resourceList->getSize());
+
   delete this->resourceList;
   // deleting the Directorie Lists
@@ -77 +81 @@
   while(tmpDir)
     {
-      delete []tmpDir;
+      delete[] tmpDir;
       tmpDir = tmpIt->nextElement();
     }