Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 13, 2005, 11:16:33 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:
orxonox/branches/physics
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics

    • Property svn:externals

      •  

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

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

    r3851 r4178  
    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;
     22class ParticleEngine;
    2423class Terrain;
    2524class GarbageCollector;
    … …  
    5756  World (char* name);
    5857  World (int worldID);
     58  World (TiXmlElement* root);
    5959  virtual ~World ();
    6060
    … …  
    7070  virtual ErrorMessage resume ();
    7171  virtual ErrorMessage destroy ();
     72
     73  void loadDebugWorld(int worldID);
    7274
    7375  virtual void displayLoadScreen();
    … …  
    8587             int parentingMode);
    8688
     89  const char* getPath();
     90  void setPath( const char* name);
    8791
    8892 private:
    89   void init(char* name, int worldID);
     93  void constuctorInit(char* name, int worldID);
    9094
    9195  Uint32 lastFrame;                   //!< last time of frame
    9296  Uint32 dt;                          //!< time needed to calculate this frame
     97  float dtS;                          //!< The time needed for caluculations in seconds
    9398  double gameTime;                    //!< this is where the game time is saved
    9499  bool bQuitOrxonox;                  //!< quit this application
    … …  
    100105  char* worldName;                    //!< The name of this World
    101106  int debugWorldNr;                   //!< The Debug Nr. needed, if something goes wrong
     107  char* path;                         //!< The file from which this world is loaded
    102108
    103109  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
    104110  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
     111  ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
    105112  Camera* localCamera;                //!< The current Camera
    106   Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    107   SkyBox* skyBox;
     113  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    108114  LightManager* lightMan;             //!< The Lights of the Level
    109115  Terrain* terrain;                   //!< The Terrain of the World.
Note: See TracChangeset for help on using the changeset viewer.