Changeset 4240 in orxonox.OLD for orxonox/branches

Timestamp:

May 20, 2005, 3:12:51 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: SkyBox loadable in the new Style

Location:

orxonox/branches/levelLoader/src

Files:

• factory.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/skybox.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

orxonox/branches/levelLoader/src/factory.h

@@ -10 +10 @@
 
 #include "tinyxml.h"
+#include "load_param.h"
 #include "debug.h"
 

orxonox/branches/levelLoader/src/world_entities/skybox.cc

@@ -59 +59 @@
 
   // Model Loading      
-  string = grabParameter( root, "materialset");
-  if( string != NULL)
-    this->setTexture(string, "jpg");
-  else
-    {
-      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
-    }
-  if( this->skyModel == NULL)
-    {
-      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
-    }
+  LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);
+
   this->postInit();
 }

orxonox/branches/levelLoader/src/world_entities/skybox.h

@@ -31 +31 @@
 
   void setSize(float size);
+  /** \brief assumes jpg as input-format */
+  void setTexture(const char* name) { setTexture (name, "jpg");};
   void setTexture(const char* name, const char* extension);
   void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);

orxonox/branches/levelLoader/src/world_entities/world_entity.cc

@@ -67 +67 @@
 void WorldEntity::loadModel(const char* fileName)
 {
+  if (this->model)
+    ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
   this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
 }