Changeset 1052 for code/trunk/src/orxonox/GraphicsEngine.cc

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/GraphicsEngine.cc (modified) (10 diffs)

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -42 +42 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/Debug.h"
 
 
 namespace orxonox {
-
-  using namespace Ogre;
 
   /**
@@ -96 +95 @@
     this->renderWindow_ = 0;
     // delete the ogre log and the logManager (since we have created it).
-    if (LogManager::getSingletonPtr() != 0)
-    {
-      LogManager::getSingleton().getDefaultLog()->removeListener(this);
-      LogManager::getSingleton().destroyLog(LogManager::getSingleton().getDefaultLog());
-      delete LogManager::getSingletonPtr();
+    if (Ogre::LogManager::getSingletonPtr() != 0)
+    {
+      Ogre::LogManager::getSingleton().getDefaultLog()->removeListener(this);
+      Ogre::LogManager::getSingleton().destroyLog(Ogre::LogManager::getSingleton().getDefaultLog());
+      delete Ogre::LogManager::getSingletonPtr();
     }
     COUT(4) << "*** GraphicsEngine: Destroying objects done" << std::endl;
@@ -121 +120 @@
     //TODO: Check if file exists (maybe not here)
 /*#ifndef OGRE_STATIC_LIB
-    root_ = new Root(configPath_ + "plugins.cfg", configPath_ + "ogre.cfg",
+    root_ = new Ogre::Root(configPath_ + "plugins.cfg", configPath_ + "ogre.cfg",
                      configPath_ + "Ogre.log");
 #else
-    root_ = new Root(NULL, configPath_ + "ogre.cfg", configPath_ + "Ogre.log");
+    root_ = new Ogre::Root(NULL, configPath_ + "ogre.cfg", configPath_ + "Ogre.log");
 #endif*/
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && defined(_DEBUG)
@@ -153 +152 @@
     // Root will detect that we've already created a Log
     COUT(4) << "*** GraphicsEngine: Creating Ogre Root..." << std::endl;
-    root_ = new Root(plugin_filename);
+    root_ = new Ogre::Root(plugin_filename);
     COUT(4) << "*** GraphicsEngine: Creating Ogre Root done" << std::endl;
   }
@@ -160 +159 @@
    * @return scene manager
    */
-  SceneManager* GraphicsEngine::getSceneManager()
+  Ogre::SceneManager* GraphicsEngine::getSceneManager()
   {
     if(!scene_)
     {
-      scene_ = root_->createSceneManager(ST_GENERIC, "Default SceneManager");
+      scene_ = root_->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
       COUT(3) << "Info: Created SceneMan: " << scene_ << std::endl;
     }
@@ -184 +183 @@
   {
     this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
-    TextureManager::getSingleton().setDefaultNumMipmaps(5);
+    Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
     //TODO: Do NOT load all the groups, why are we doing that? And do we really do that? initialise != load...
-    ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+    Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
   }
 
@@ -194 +193 @@
     //TODO: Work with ressource groups (should be generated by a special loader)
     // Load resource paths from data file using configfile ressource type
-    ConfigFile cf;
+    Ogre::ConfigFile cf;
     cf.load(dataPath + "resources.cfg");
 
     // Go through all sections & settings in the file
-    ConfigFile::SectionIterator seci = cf.getSectionIterator();
+    Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
 
     std::string secName, typeName, archName;
@@ -204 +203 @@
     {
       secName = seci.peekNextKey();
-      ConfigFile::SettingsMultiMap *settings = seci.getNext();
-      ConfigFile::SettingsMultiMap::iterator i;
+      Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+      Ogre::ConfigFile::SettingsMultiMap::iterator i;
       for (i = settings->begin(); i != settings->end(); ++i)
       {
@@ -211 +210 @@
         archName = i->second; // name (and location) of archive
 
-        ResourceGroupManager::getSingleton().addResourceLocation(
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
                                            std::string(dataPath + archName),
                                            typeName, secName);
@@ -269 +268 @@
   */
   void GraphicsEngine::messageLogged(const std::string& message,
-    LogMessageLevel lml, bool maskDebug, const std::string &logName)
+    Ogre::LogMessageLevel lml, bool maskDebug, const std::string &logName)
   {
     int orxonoxLevel;
     switch (lml)
     {
-      case LML_TRIVIAL:
+      case Ogre::LML_TRIVIAL:
         orxonoxLevel = this->ogreLogLevelTrivial_;
         break;
-      case LML_NORMAL:
+      case Ogre::LML_NORMAL:
         orxonoxLevel = this->ogreLogLevelNormal_;
         break;
-      case LML_CRITICAL:
+      case Ogre::LML_CRITICAL:
         orxonoxLevel = this->ogreLogLevelCritical_;
         break;