Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 18, 2005, 11:27:40 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/movie_player/src/story_entities/world.h

    r4010 r4217  
    1919class PNode;
    2020class GLMenuImageScreen;
    21 class Skysphere;
    22 class SkyBox;
    2321class LightManager;
     22class ParticleEngine;
    2423class Terrain;
    2524class GarbageCollector;
     
    9695  Uint32 lastFrame;                   //!< last time of frame
    9796  Uint32 dt;                          //!< time needed to calculate this frame
     97  float dtS;                          //!< The time needed for caluculations in seconds
    9898  double gameTime;                    //!< this is where the game time is saved
    9999  bool bQuitOrxonox;                  //!< quit this application
     
    109109  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
    110110  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
     111  ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
    111112  Camera* localCamera;                //!< The current Camera
    112   Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    113   SkyBox* skyBox;
     113  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
    114114  LightManager* lightMan;             //!< The Lights of the Level
    115115  Terrain* terrain;                   //!< The Terrain of the World.
Note: See TracChangeset for help on using the changeset viewer.