Changeset 1625 for code/trunk/src/orxonox/Orxonox.h

Timestamp:

Jun 26, 2008, 2:13:17 PM (16 years ago)

Author:

rgrieder

Message:

merged hud branch back to trunk

File:

• code/trunk/src/orxonox/Orxonox.h (modified) (2 diffs)

code/trunk/src/orxonox/Orxonox.h

@@ -62 +62 @@
 
       void abortRequest();
-      //inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
 
       static Orxonox* getSingleton();
@@ -93 +92 @@
     private:
       GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
+      Level*                startLevel_;    //!< current hard coded default level
+      Level*                hud_;           //!< 'level' object fo the HUD
+      Radar*                radar_;         //!< represents the Radar (not the HUD part)
       //audio::AudioManager*  auMan_;         //!< audio manager
       Ogre::Timer*          timer_;         //!< Main loop timer
-      // TODO: make this a config-value by creating a config class for orxonox
-      float                 frameSmoothingTime_;
-      HUD*                  orxonoxHUD_;
       bool                  bAbort_;        //!< aborts the render loop if true
       float                 timefactor_;    //!< A factor to change the gamespeed