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

Timestamp:

Nov 21, 2007, 12:44:02 AM (16 years ago)

Author:

rgrieder

Message:

• modified the AmmunitionDump to hold different types of ammo
• converted the RunManager into a Singleton
• added some methods to address ammo by string
• created a BaseWeapon class
• derived BarrelGun from BaseWeapon

File:

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

code/branches/main_reto_vs05/src/run_manager.h

@@ -33 +33 @@
 #include "OgreWindowEventUtilities.h"
 #include "OgreTextureManager.h"
+#include "OgreSingleton.h"
 
 #include <OIS/OISPrereqs.h>
@@ -43 +44 @@
   // 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 : Ogre::WindowEventListener
+  class RunManager : public Ogre::WindowEventListener,
+                     public Ogre::Singleton<RunManager>
   {
   public:
-          RunManager(OgreControl*);
+    RunManager(OgreControl*);
 
-          virtual ~RunManager();
+    virtual ~RunManager();
+    //void initialise(OgreControl*);
 
-    virtual bool tick(unsigned long, Ogre::Real);
+    bool tick(unsigned long, Ogre::Real);
+
+    Ogre::SceneManager& getSceneManager();
+
+    Ogre::SceneManager* getSceneManagerPtr();
+
+    weapon::BulletManager* getBulletManagerPtr();
+
+    int getAmmunitionID(const Ogre::String&);
+
+    int getNumberOfAmmos();
+
+    static RunManager& getSingleton(void);
+
+    static RunManager* getSingletonPtr(void);
+
 
   protected:
-          virtual void createCamera(void);
+          void createCamera(void);
 
-          virtual void createViewports(void);
+          void createViewports(void);
 
 
@@ -61 +79 @@
 
           //Adjust mouse clipping area
-          virtual void windowResized(Ogre::RenderWindow*);
+          void windowResized(Ogre::RenderWindow*);
 
           //Unattach OIS before window shutdown (very important under Linux)
-          virtual void windowClosed(Ogre::RenderWindow*);
+          void windowClosed(Ogre::RenderWindow*);
 
 
           /** INPUT PROCESSING **/
-          virtual bool processUnbufferedKeyInput();
+          bool processUnbufferedKeyInput();
 
-          virtual bool processUnbufferedMouseInput();
+          bool processUnbufferedMouseInput();
 
 
           /** OUTPUT **/
 
-          virtual void updateStats(void);
+          void updateStats(void);
 
-          virtual void showDebugOverlay(bool);
+          void showDebugOverlay(bool);
 
   protected: