Changeset 929 for code/branches/network/src/orxonox/GraphicsEngine.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/GraphicsEngine.h (modified) (4 diffs)

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

@@ -10 +10 @@
 #include <string>
 
+#include <OgrePrerequisites.h>
 #include <OgreRoot.h>
 #include <OgreSceneManager.h>
 
 #include "OrxonoxPrereqs.h"
-#include "core/BaseObject.h"
+#include "core/OrxonoxClass.h"
 
 
@@ -22 +23 @@
    * graphics engine manager class
  */
-  class _OrxonoxExport GraphicsEngine : public BaseObject
+  class _OrxonoxExport GraphicsEngine : public OrxonoxClass
   {
     public:
@@ -28 +29 @@
       inline void setConfigPath(std::string path) { this->configPath_ = path; };
       // find a better way for this
-      inline Ogre::Root* getRoot() { return root_; };
+      //inline Ogre::Root* getRoot() { return root_; };
       void setConfigValues();
       void setup();
@@ -34 +35 @@
       void loadRessourceLocations(std::string path);
       Ogre::SceneManager* getSceneManager();
-      void startRender();
+      void initialise();
 
       // several window properties
+      Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; }
       size_t getWindowHandle();
       int getWindowWidth() const;
       int getWindowHeight() const;
 
+      // Ogre Root access for Orxonox
+      void frameStarted(Ogre::FrameEvent &evt)
+      { if (root_) root_->_fireFrameStarted(evt); }
+      void frameEnded  (Ogre::FrameEvent &evt)
+      { if (root_) root_->_fireFrameEnded(evt);   }
+      void renderOneFrame()
+      { if (root_) root_->_updateAllRenderTargets(); }
+
       virtual ~GraphicsEngine();
+
     private:
       Ogre::Root*         root_;        //!< Ogre's root