Changeset 7221 in orxonox.OLD for trunk/src/world_entities/planet.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/planet.h (modified) (3 diffs)

trunk/src/world_entities/planet.h

@@ -9 +9 @@
 /* INCLUDES */
 #include "world_entity.h"
-
+#include "material.h"
 /* FORWARD DECLARATION */
-class Material;
 class Texture;
 
@@ -26 +25 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* textureName);
+  void setTexture(const std::string& textureName);
 
 
@@ -34 +33 @@
 
  private:
-  Material*       material;        //!< Materials for the Planet. sorted by number (0-5) top, bottom, left, right, front, back
+  Material        material;        //!< Materials for the Planet. sorted by number (0-5) top, bottom, left, right, front, back
   Texture*        texture;         //!< Textures for the CubeMap.