Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/src/story_entities/world.h

    r3851 r4122  
    1111#include "story_entity.h"
    1212#include "p_node.h"
    13 
     13#include "xmlparser/tinyxml.h"
    1414
    1515class World;
    … …  
    1919class PNode;
    2020class GLMenuImageScreen;
    21 class Skysphere;
    22 class SkyBox;
    2321class LightManager;
    2422class Terrain;
    … …  
    5755  World (char* name);
    5856  World (int worldID);
     57  World (TiXmlElement* root);
    5958  virtual ~World ();
    6059
    … …  
    7069  virtual ErrorMessage resume ();
    7170  virtual ErrorMessage destroy ();
     71
     72  void loadDebugWorld(int worldID);
    7273
    7374  virtual void displayLoadScreen();
    … …  
    8586             int parentingMode);
    8687
     88  const char* getPath();
     89  void setPath( const char* name);
    8790
    8891 private:
    89   void init(char* name, int worldID);
     92  void constuctorInit(char* name, int worldID);
    9093
    9194  Uint32 lastFrame;                   //!< last time of frame
    … …  
    100103  char* worldName;                    //!< The name of this World
    101104  int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
     105  char* path;                         //!< The file from which this world is loaded
    102106
    103107  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
    104108  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
    105109  Camera* localCamera;                //!< The current Camera
    106   Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    107   SkyBox* skyBox;
     110  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    108111  LightManager* lightMan;             //!< The Lights of the Level
    109112  Terrain* terrain;                   //!< The Terrain of the World.
Note: See TracChangeset for help on using the changeset viewer.