Changeset 4242 in orxonox.OLD for orxonox/branches/levelLoader/src/world_entities

Timestamp:

May 20, 2005, 3:55:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: better compatibility with more functions

Location:

orxonox/branches/levelLoader/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• skybox.h (modified) (1 diff)

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

@@ -56 +56 @@
   this->preInit();
 
-  const char* string;
-
-  // Model Loading      
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);
 
@@ -107 +104 @@
                "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
 */
-void SkyBox::setTexture(const char* name, const char* extension)
+void SkyBox::setTextureAndType(const char* name, const char* extension)
 {
   char* top    = new char[strlen(name)+strlen(extension)+ 10];

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

@@ -32 +32 @@
   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 setTexture(const char* name) { setTextureAndType (name, "jpg");};
+  void setTextureAndType(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);