Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/world_entities/skybox.h

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

• orxonox/branches/physics/src/world_entities/skybox.h (modified) (2 diffs)

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

@@ -21 +21 @@
 {
  public:
-  SkyBox(char* fileName = NULL);
-  SkyBox(TiXmlElement* root);
+  SkyBox(const char* fileName = NULL);
+  SkyBox(const TiXmlElement* root);
 
   virtual ~SkyBox();
+
+  void loadParams(const TiXmlElement* root);
 
   void preInit(void);
@@ -31 +33 @@
 
   void setSize(float size);
-  void setTexture(const char* name, const char* extension);
+  /** \brief assumes jpg as input-format */
+  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);