Changeset 7123 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 11, 2006, 8:57:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some cleanup before the new tag

1. BaseObject isA was wrong… every subclass was detected as any other subclass
2. Classes get unloaded again as they should
3. some minor fixes (Material* → Material) and some other cleanups

Location:

trunk/src/world_entities

Files:

• skybox.cc (modified) (3 diffs)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/skybox.cc

@@ -27 +27 @@
 #include "network_game_manager.h"
 #include "converter.h"
+#include "resource_manager.h"
+
 
 using namespace std;
@@ -107 +109 @@
     if( this->material[i])
       delete this->material[i];
-//     if( this->cubeTexture[i])
-//       delete this->cubeTexture[i];
+    if( this->cubeTexture[i])
+      ResourceManager::getInstance()->unload(this->cubeTexture[i]);
   }
 }
@@ -169 +171 @@
     this->loadCubeMapTextures(top, bottom, left, right, front, back);
 }
-
-
-#include "resource_manager.h"
 
 void SkyBox::loadCubeMapTextures(const char* top, const char* bottom, const char* left,

trunk/src/world_entities/world_entity.cc

@@ -190 +190 @@
   {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
-    //     if (resource != NULL)
-    ResourceManager::getInstance()->unload(resource, RP_LEVEL);
-  }
-  else
-    delete this->models[modelNumber];
+    if (resource != NULL)
+      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
+    else
+    {
+      PRINTF(4)("Forcing model deletion\n");
+      delete this->models[modelNumber];
+    }
+  }
 
   this->models[modelNumber] = model;