Changeset 288 for code/branches/main_reto_vs05/src/run_manager.h

Timestamp:

Nov 27, 2007, 11:49:42 PM (16 years ago)

Author:

rgrieder

Message:

• added Chai's HUD overlay
• abstracted debugOverlay —> TestOverlay
• added overlay media files
• cleaned up RunManager a little bit
• omitted using ogre's Singleton template
• added useful CMake structure
• some more things

File:

• code/branches/main_reto_vs05/src/run_manager.h (modified) (6 diffs)

code/branches/main_reto_vs05/src/run_manager.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 #include "OgreWindowEventUtilities.h"
-#include "OgreTextureManager.h"
-#include "OgreSingleton.h"
+//#include "OgreTextureManager.h"
 
 #include <OIS/OISPrereqs.h>
@@ -44 +43 @@
   // let the class inherit from WindowEventListener in order for the RunMgr
   // to act as the central point of all the calcuations in Orxonox
-  class RunManager : public Ogre::WindowEventListener,
-                     public Ogre::Singleton<RunManager>
+  class RunManager : public Ogre::WindowEventListener
   {
   public:
-    RunManager(OgreControl*);
-
     virtual ~RunManager();
-    //void initialise(OgreControl*);
+    
+    void initialise(OgreControl*);
 
     bool tick(unsigned long, Ogre::Real);
@@ -65 +62 @@
     int getNumberOfAmmos();
 
+    static RunManager* createSingleton();
+
+    static void destroySingleton();
+
     static RunManager& getSingleton(void);
 
@@ -71 +72 @@
 
   protected:
+    RunManager();
+
           void createCamera(void);
 
@@ -93 +96 @@
           /** OUTPUT **/
 
-          void updateStats(void);
-
           void showDebugOverlay(bool);
 
   protected:
+    // directly Ogre related fields
           Ogre::SceneManager *sceneMgr_;
           Ogre::RenderWindow *window_;
           Ogre::Camera       *camera_;
+
+
+    // self made orxonox fields
           OgreControl  *ogre_;
           OrxonoxScene *backgroundScene_;
           OrxonoxShip  *playerShip_;
+    hud::TestOverlay *hud_;
 
+    // Bullet manager
+    weapon::BulletManager *bulletManager_;
+
+    const Ogre::Real mouseSensitivity_;
+
+          // previously elapsed render time
+          unsigned long totalTime_;
+
+
+    // fields from the example framework
           bool statsOn_;
-          std::string debugText_;
 
           unsigned int screenShotCounter_;
           // just to stop toggles flipping too fast
           Ogre::Real timeUntilNextToggle_;
-          //bool leftButtonDown_;
-          Ogre::TextureFilterOptions filtering_;
-          int aniso_;
-
-          int sceneDetailIndex_;
-          Ogre::Overlay* debugOverlay_;
 
           //OIS Input devices
@@ -124 +133 @@
           OIS::JoyStick* joystick_;
 
-    const Ogre::Real mouseSensitivity_;
-
-    // Bullet array
-          /*Bullet **bullets_;
-          int bulletsSize_;
-          int bulletsIndex_;*/
-    weapon::BulletManager *bulletManager_;
-
-          // previously elapsed render time
-          unsigned long totalTime_;
+    // singleton pointer
+    static RunManager *singletonPtr_s;
 
   };