Changeset 289 for code/branches/main_reto/src/run_manager.h

Timestamp:

Nov 27, 2007, 11:54:13 PM (17 years ago)

Author:

rgrieder

Message:

• updated the source files and CMLs
• adjusted resources.cfg for the new hud overlay

File:

• code/branches/main_reto/src/run_manager.h (modified) (8 diffs)

code/branches/main_reto/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);
 
@@ -108 +109 @@
           OrxonoxScene *backgroundScene_;
           OrxonoxShip  *playerShip_;
-    hud::HUDOverlay   *hud_;
+    hud::TestOverlay *hud_;
 
     // Bullet manager
@@ -121 +122 @@
     // 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
@@ -138 +133 @@
           OIS::JoyStick* joystick_;
 
+    // singleton pointer
+    static RunManager *singletonPtr_s;
+
   };