Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/world_entities/skybox.h

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/world_entities/skybox.h (modified) (1 diff)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

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

@@ -22 +22 @@
  public:
   SkyBox(char* fileName = NULL);
+  SkyBox(TiXmlElement* root);
+
   virtual ~SkyBox();
+
+  void preInit(void);
+  void postInit(void);
+
 
   void setSize(float size);

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+