Changeset 2509 for code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.h

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/orxonox/gamestates/GSGraphics.h (modified) (2 diffs)

code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.h

@@ -60 +60 @@
 
         void setupOgre();
+        void loadOgrePlugins();
         void declareResources();
         void loadRenderer();
@@ -105 +106 @@
         std::string           resourceFile_;             //!< resources file name
         std::string           ogreConfigFile_;           //!< ogre config file name
-        std::string           ogrePluginsFile_;          //!< ogre plugins file name
+        std::string           ogrePluginsFolder_;        //!< Folder where the Ogre plugins are located
+        std::string           ogrePlugins_;              //!< Comma separated list of all plugins to load
         std::string           ogreLogFile_;              //!< log file name for Ogre log messages
         int                   ogreLogLevelTrivial_;      //!< Corresponding Orxonx debug level for LL_TRIVIAL