Changeset 5679 for code/branches/resource3/src/orxonox

Timestamp:

Aug 24, 2009, 8:17:56 PM (15 years ago)

Author:

rgrieder

Message:

Merged revision 5641 to resource3:

• Prepared build system for an external media directory.

Location:

code/branches/resource3/src/orxonox

Files:

• LevelManager.cc (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• objects/Level.cc (modified) (2 diffs)
• orxonox.vcproj.user.in (modified) (4 diffs)
• sound/SoundBase.cc (modified) (1 diff)

code/branches/resource3/src/orxonox/LevelManager.cc

@@ -135 +135 @@
         availableLevels_.clear();
 
-        boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
+        boost::filesystem::directory_iterator file(Core::getExternalMediaPathString() + "levels");
         boost::filesystem::directory_iterator end;
 

code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc

@@ -96 +96 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile(Core::getExternalMediaPathString() + "overlay/debug.oxo");
         Loader::open(debugOverlay_);
 

code/branches/resource3/src/orxonox/gamestates/GSLevel.cc

@@ -246 +246 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
+        startFile_s = new XMLFile(Core::getExternalMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_s);
     }

code/branches/resource3/src/orxonox/objects/Level.cc

@@ -54 +54 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
+        if (this->xmlfilename_.length() >= Core::getExternalMediaPathString().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getExternalMediaPathString().length());
     }
 
@@ -101 +101 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getExternalMediaPathString() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);

code/branches/resource3/src/orxonox/orxonox.vcproj.user.in

@@ -11 +11 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -20 +20 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -29 +29 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />
@@ -38 +38 @@
                         <DebugSettings
                                 WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
-                                Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+                                Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
                                 EnvironmentMerge="true"
                         />

code/branches/resource3/src/orxonox/sound/SoundBase.cc

@@ -135 +135 @@
 
     bool SoundBase::loadFile(std::string filename) {
-        filename = Core::getMediaPathString() + "/audio/" + filename;
+        filename = Core::getExternalMediaPathString() + "/audio/" + filename;
 
         if(!SoundManager::getInstance().isSoundAvailable())