Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
May 22, 2005, 3:19:57 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/world_entities/skybox.h

    r4136 r4261  
    2121{
    2222 public:
    23   SkyBox(char* fileName = NULL);
    24   SkyBox(TiXmlElement* root);
     23  SkyBox(const char* fileName = NULL);
     24  SkyBox(const TiXmlElement* root);
    2525
    2626  virtual ~SkyBox();
     27
     28  void loadParams(const TiXmlElement* root);
    2729
    2830  void preInit(void);
     
    3133
    3234  void setSize(float size);
    33   void setTexture(const char* name, const char* extension);
     35  /** \brief assumes jpg as input-format */
     36  void setTexture(const char* name) { setTextureAndType (name, "jpg");};
     37  void setTextureAndType(const char* name, const char* extension);
    3438  void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);
    3539
Note: See TracChangeset for help on using the changeset viewer.