Changeset 5308 in orxonox.OLD for trunk/src/world_entities/terrain.cc

Timestamp:

Oct 8, 2005, 12:32:52 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Fixed a reversive BUG in the ResourceManager:
Since resources, that depend on each other are loaded left tgo right they must be unlinked right to left… this cost me 3 hours.
What a luck i found this

File:

• trunk/src/world_entities/terrain.cc (modified) (6 diffs)

trunk/src/world_entities/terrain.cc

@@ -39 +39 @@
   this->loadParams(root);
 
-  this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+//  if (this->model != NULL)
+    //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
 }
 
@@ -53 +54 @@
   this->init();
 
-  if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
-    {
-      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_LEVEL);
+  if (!strcasestr(fileName, ".obj") )
+    {
+      this->loadModel(fileName);
     }
   else
@@ -65 +66 @@
 /**
  *  a Constructor for the Debug-Worlds
-
-   @todo make it not compileable when not in debug-mode
-*/
+ */
 Terrain::Terrain(DebugTerrain debugTerrain)
 {
@@ -92 +91 @@
 
   this->objectList = 0;
+  this->ssp = NULL;
 }
 
@@ -122 +122 @@
 
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
-  this->ssp->drawQuadtree();
+  if (this->ssp != NULL)
+    this->ssp->drawQuadtree();
 }
 
@@ -289 +290 @@
       */
     }
-
-}
+}