Changeset 929 for code/branches/network/src/orxonox/Orxonox.h

Timestamp:

Mar 26, 2008, 11:39:55 PM (16 years ago)

Author:

rgrieder

Message:

• removed getRoot() from GaphicsEngine —> added getRenderWindow() —> added 3 function to control render loop
• rearranged the sequence of methods in Orxonox.cc to make it a little bit more logical
• added deletion code in Orxonox.cc destructor
• fixed a bug in AudioManger destructor
• fixed a bug in InputHandler destroy()

File:

• code/branches/network/src/orxonox/Orxonox.h (modified) (3 diffs)

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

@@ -36 +36 @@
       void start();
       // not sure if this should be private
-      void die(/* some error code */);
+      void abortImmediate(/* some error code */);
       void abortRequest();
+      inline Ogre::SceneManager*  getSceneManager()        { return ogre_->getSceneManager(); };
+      inline GraphicsEngine*      getOgrePointer()         { return ogre_; };
+      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
+      inline BulletManager*       getBulletMgr()           { return this->bulletMgr_; }
+
       static Orxonox* getSingleton();
-      inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
-      inline GraphicsEngine* getOgrePointer()              { return ogre_; };
-      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
-      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
-    private:
+   private:
+      // don't mess with singletons
       Orxonox();
-      virtual ~Orxonox();
+      Orxonox(Orxonox& instance);
+      Orxonox& operator=(const Orxonox& instance);
+      ~Orxonox();
+
       // init functions
       void serverInit(std::string path);
       void clientInit(std::string path);
       void standaloneInit(std::string path);
+
       // run functions
       void serverStart();
@@ -56 +62 @@
       void standaloneStart();
 
-      void createScene(void);
+      void createScene();
       void setupInputSystem();
       void startRenderLoop();
@@ -68 +74 @@
       audio::AudioManager*  auMan_;         //!< audio manager
       BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
-      InputHandler*         inputHandler_;
-      Ogre::Root*           root_;
+      InputHandler*         inputHandler_;  //!< Handles input with key bindings
+      Ogre::Root*           root_;          //!< Holy grail of Ogre
+      Ogre::Timer*          timer_;         //!< Main loop timer
       // TODO: make this a config-value by creating a config class for orxonox
       float                 frameSmoothingTime_;