Changeset 2759 for code/trunk/src/orxonox

Timestamp:

Mar 8, 2009, 4:51:27 PM (16 years ago)

Author:

scheusso

Message:

merged network branch (windows,multiplayer fixes) back to trunk

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (6 diffs)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• gui/GUIManager.cc (modified) (1 diff)
• objects/worldentities/ExplosionChunk.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -136 +136 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").file_string());
+        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").string());
         Loader::open(debugOverlay_);
 
@@ -304 +304 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        myLog = ogreLogger_->createLog(ogreLogFilepath.file_string(), true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
@@ -317 +317 @@
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFilepath.file_string().c_str());
+            creator.open(ogreConfigFilepath.string().c_str());
             creator.close();
         }
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.file_string(), ogreLogFilepath.file_string());
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.string(), ogreLogFilepath.string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -336 +336 @@
         // Do some SubString magic to get the comma separated list of plugins
         SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
+        // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)
             ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
@@ -356 +357 @@
         try
         {
-            cf.load((Core::getMediaPath() / resourceFile_).file_string());
+            cf.load((Core::getMediaPath() / resourceFile_).string());
         }
         catch (...)
@@ -382 +383 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        (Core::getMediaPath() / archName).directory_string(), typeName, secName);
+                        (Core::getMediaPath() / archName).string(), typeName, secName);
                 }
             }

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -202 +202 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + CP_SLASH + levelName);
+        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
         Loader::open(startFile_);
     }

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

@@ -104 +104 @@
 
         // initialise TCL
-        this->tclBind_ = new TclBind(Core::getMediaPathPOSIXString());
+        this->tclBind_ = new TclBind(Core::getMediaPathString());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -154 +154 @@
                 boost::filesystem::path ceguiLogFilepath(Core::getLogPath() / "cegui.log");
                 this->ceguiLogger_ = new DefaultLogger();
-                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.string());
                 // set the log level according to ours (translate by subtracting 1)
                 this->ceguiLogger_->setLoggingLevel(

code/trunk/src/orxonox/objects/worldentities/ExplosionChunk.cc

@@ -47 +47 @@
         RegisterObject(ExplosionChunk);
 
-        if (!this->getScene() || !Core::showsGraphics() || !this->getScene()->getSceneManager())
+        if ( Core::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
             ThrowException(AbortLoading, "Can't create ExplosionChunk, no scene or no scene manager given.");
 
@@ -53 +53 @@
         this->LOD_ = LODParticle::normal;
 
-        try
+        if ( Core::showsGraphics() )
         {
-            this->fire_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/fire4", this->LOD_);
-            this->attachOgreObject(this->fire_->getParticleSystem());
-            this->smoke_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
-            this->attachOgreObject(this->smoke_->getParticleSystem());
+            try
+            {
+                this->fire_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/fire4", this->LOD_);
+                this->attachOgreObject(this->fire_->getParticleSystem());
+                this->smoke_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
+                this->attachOgreObject(this->smoke_->getParticleSystem());
+            }
+            catch (...)
+            {
+                COUT(1) << "Error: Couln't load particle effect in ExplosionChunk." << std::endl;
+                this->fire_ = 0;
+                this->smoke_ = 0;
+            }
         }
-        catch (...)
+        else
         {
-            COUT(1) << "Error: Couln't load particle effect in ExplosionChunk." << std::endl;
             this->fire_ = 0;
             this->smoke_ = 0;