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

Timestamp:

Oct 8, 2005, 12:32:52 AM (19 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

Location:

trunk/src/world_entities

Files:

• environment.cc (modified) (1 diff)
• skybox.cc (modified) (1 diff)
• terrain.cc (modified) (6 diffs)
• terrain.h (modified) (1 diff)

trunk/src/world_entities/environment.cc

@@ -34 +34 @@
 {
   this->setClassID(CL_ENVIRONMENT, "Environment");
-  this->model = (Model*)ResourceManager::getInstance()->load("models/ships/bolido.obj", OBJ, RP_CAMPAIGN);
+  this->loadModel("models/ships/bolido.obj");
 
 /*  if(this->obbTree == NULL)

trunk/src/world_entities/skybox.cc

@@ -101 +101 @@
   for (int i = 0; i < 6; i++)
     delete this->material[i];
-  delete []this->material;
+  delete[] this->material;
   delete this->model;
   this->model = NULL; //< so that WorldEntity does not try to delete it again.

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 @@
       */
     }
-
-}
+}

trunk/src/world_entities/terrain.h

@@ -42 +42 @@
  private:
   int objectList;
-
 };