Changeset 9869 in orxonox.OLD for trunk/src/world_entities/skybox.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/skybox.h (modified) (2 diffs)

trunk/src/world_entities/skybox.h

@@ -27 +27 @@
 class SkyBox : public WorldEntity
 {
- public:
+  ObjectListDeclaration(SkyBox);
+public:
   SkyBox(const std::string& fileName = "");
   SkyBox(const TiXmlElement* root);
@@ -64 +65 @@
 
   Material*       material[6];     //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
-  Texture*        cubeTexture[6];  //!< Textures for the CubeMap.
+  Texture         cubeTexture[6];  //!< Textures for the CubeMap.
 
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.