Changeset 1891 for code/trunk/src/orxonox/gamestates/GSRoot.h

Timestamp:

Oct 6, 2008, 7:39:38 PM (16 years ago)

Author:

rgrieder

Message:

Moved all Ogre related code from GSRoot to GSGraphics.
You should now be able to start the gui, goto ioConsole, then start the gui again and load the level.
gui —> level —> gui doesn't yet work. But I will not dig into that until our object hierarchy has been replaced.

File:

• code/trunk/src/orxonox/gamestates/GSRoot.h (modified) (3 diffs)

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public RootGameState, public Ogre::LogListener, public OrxonoxClass
+    class _OrxonoxExport GSRoot : public RootGameState, public OrxonoxClass
     {
         friend class ClassIdentifier<GSRoot>;
@@ -47 +47 @@
         { requestState("root"); }
 
-        Ogre::Root* getOgreRoot() { return this->ogreRoot_; }
-        GraphicsEngine* getGraphicsEngine() { return this->graphicsEngine_; }
-
     private:
         void enter();
@@ -56 +53 @@
 
         void setConfigValues();
-        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml,
-            bool maskDebug, const std::string& logName);
         void setThreadAffinity(unsigned int limitToCPU);
-        void setupOgre();
 
         Settings*             settings_;
-        Ogre::Root*           ogreRoot_;                  //!< Ogre's root
-        Ogre::LogManager*     ogreLogger_;
-        GraphicsEngine*       graphicsEngine_;   //!< Interface to Ogre
         TclBind*              tclBind_;
         TclThreadManager*     tclThreadManager_;
         Shell*                shell_;
-
-        std::string           ogreConfigFile_;        //!< ogre config file name
-        std::string           ogrePluginsFile_;       //!< ogre plugins file name
-        std::string           ogreLogFile_;           //!< log file name for Ogre log messages
-        int                   ogreLogLevelTrivial_;   //!< Corresponding Orxonx debug level for LL_TRIVIAL
-        int                   ogreLogLevelNormal_;    //!< Corresponding Orxonx debug level for LL_NORMAL
-        int                   ogreLogLevelCritical_;  //!< Corresponding Orxonx debug level for LL_CRITICAL
     };
 }