Changeset 1653 for code/branches/gui/src/orxonox/Orxonox.h

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

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

code/branches/gui/src/orxonox/Orxonox.h

@@ -84 +84 @@
 
     private:
-      Level*                startLevel_;    //!< current hard coded default level
-      Level*                hud_;           //!< 'level' object fo the HUD
-      //audio::AudioManager*  auMan_;         //!< audio manager
-      Ogre::Timer*          timer_;         //!< Main loop timer
-      bool                  bAbort_;        //!< aborts the render loop if true
-      float                 timefactor_;    //!< A factor to change the gamespeed
+      Level*                startLevel_;       //!< current hard coded default level
+      Level*                hud_;              //!< 'level' object fo the HUD
+      //audio::AudioManager*  auMan_;            //!< audio manager
+      Ogre::Timer*          timer_;            //!< Main loop timer
+      bool                  bAbort_;           //!< aborts the render loop if true
+      float                 timefactor_;       //!< A factor to change the gamespeed
 
       // this is used to identify the mode (server/client/...) we're in
@@ -99 +99 @@
 
       // By Orxonox managed singleton pointers
-      GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
+      GraphicsEngine*       graphicsEngine_;   //!< our dearest graphics engine <3
       InputManager*         inputManager_;
-      Radar*                radar_;         //!< represents the Radar (not the HUD part)
+      Radar*                radar_;            //!< represents the Radar (not the HUD part)
       InGameConsole*        console_;
       GUIManager*           guiManager_;