Changeset 5645 for code/branches/resource2/src/core/Core.cc

Timestamp:

Aug 13, 2009, 10:50:07 PM (15 years ago)

Author:

rgrieder

Message:

Renamed media to data to restore consistency with game/data/trunk folder name.
Couldn't yet rename the media folder though probably due to some fundamental limitations of SVN (believe me, I tried).

Location:

code/branches/resource2

Files:

• . (modified) (1 prop)
• src/core/Core.cc (modified) (9 diffs)

code/branches/resource2

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

code/branches/resource2/src/core/Core.cc

@@ -85 +85 @@
     Core* Core::singletonPtr_s  = 0;
 
-    SetCommandLineArgument(externalMediaPath, "").information("Path to the external media files");
+    SetCommandLineArgument(externalDataPath, "").information("Path to the external data files");
     SetCommandLineOnlyArgument(writingPathSuffix, "").information("Additional subfolder for config and log files");
     SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
@@ -110 +110 @@
             this->setConfigValues();
 
-            // External media directory only exists for dev runs
+            // External data directory only exists for dev runs
             if (Core::isDevelopmentRun())
             {
-                // Possible media path override by the command line
-                if (!CommandLine::getArgument("externalMediaPath")->hasDefaultValue())
-                    tsetExternalMediaPath(CommandLine::getValue("externalMediaPath"));
+                // Possible data path override by the command line
+                if (!CommandLine::getArgument("externalDataPath")->hasDefaultValue())
+                    tsetExternalDataPath(CommandLine::getValue("externalDataPath"));
             }
         }
@@ -188 +188 @@
         /**
         @brief
-            Temporary sets the media path
+            Temporary sets the data path
         @param path
-            The new media path
+            The new data path
         */
-        void tsetExternalMediaPath(const std::string& path)
-        {
-            mediaPath_ = boost::filesystem::path(path);
+        void tsetExternalDataPath(const std::string& path)
+        {
+            dataPath_ = boost::filesystem::path(path);
         }
 
@@ -218 +218 @@
         boost::filesystem::path rootPath_;
         boost::filesystem::path executablePath_;        //!< Path to the executable
-        boost::filesystem::path mediaPath_;             //!< Path to the media file folder
-        boost::filesystem::path externalMediaPath_;     //!< Path to the media file folder
+        boost::filesystem::path dataPath_;              //!< Path to the data file folder
+        boost::filesystem::path externalDataPath_;      //!< Path to the external data file folder
         boost::filesystem::path configPath_;            //!< Path to the config file folder
         boost::filesystem::path logPath_;               //!< Path to the log file folder
@@ -283 +283 @@
 
         // initialise Tcl
-        this->tclBind_.reset(new TclBind(Core::getMediaPathString()));
+        this->tclBind_.reset(new TclBind(Core::getDataPathString()));
         this->tclThreadManager_.reset(new TclThreadManager(tclBind_->getTclInterpreter()));
 
@@ -401 +401 @@
     }
 
-    /*static*/ void Core::tsetExternalMediaPath(const std::string& path)
-    {
-        getInstance().configuration_->tsetExternalMediaPath(path);
-    }
-
-    /*static*/ const boost::filesystem::path& Core::getMediaPath()
-    {
-        return getInstance().configuration_->mediaPath_;
-    }
-    /*static*/ std::string Core::getMediaPathString()
-    {
-        return getInstance().configuration_->mediaPath_.string() + '/';
-    }
-
-    /*static*/ const boost::filesystem::path& Core::getExternalMediaPath()
-    {
-        return getInstance().configuration_->externalMediaPath_;
-    }
-    /*static*/ std::string Core::getExternalMediaPathString()
-    {
-        return getInstance().configuration_->externalMediaPath_.string() + '/';
+    /*static*/ void Core::tsetExternalDataPath(const std::string& path)
+    {
+        getInstance().configuration_->tsetExternalDataPath(path);
+    }
+
+    /*static*/ const boost::filesystem::path& Core::getDataPath()
+    {
+        return getInstance().configuration_->dataPath_;
+    }
+    /*static*/ std::string Core::getDataPathString()
+    {
+        return getInstance().configuration_->dataPath_.string() + '/';
+    }
+
+    /*static*/ const boost::filesystem::path& Core::getExternalDataPath()
+    {
+        return getInstance().configuration_->externalDataPath_;
+    }
+    /*static*/ std::string Core::getExternalDataPathString()
+    {
+        return getInstance().configuration_->externalDataPath_.string() + '/';
     }
 
@@ -561 +561 @@
             COUT(1) << "Running from the build tree." << std::endl;
             Core::bDevRun_ = true;
-            configuration_->mediaPath_  = specialConfig::mediaDevDirectory;
-            configuration_->externalMediaPath_ = specialConfig::externalMediaDevDirectory;
+            configuration_->dataPath_  = specialConfig::dataDevDirectory;
+            configuration_->externalDataPath_ = specialConfig::externalDataDevDirectory;
             configuration_->configPath_ = specialConfig::configDevDirectory;
             configuration_->logPath_    = specialConfig::logDevDirectory;
@@ -579 +579 @@
 
             // Using paths relative to the install prefix, complete them
-            configuration_->mediaPath_  = configuration_->rootPath_ / specialConfig::defaultMediaPath;
+            configuration_->dataPath_  = configuration_->rootPath_ / specialConfig::defaultDataPath;
             configuration_->configPath_ = configuration_->rootPath_ / specialConfig::defaultConfigPath;
             configuration_->logPath_    = configuration_->rootPath_ / specialConfig::defaultLogPath;
@@ -585 +585 @@
             // There is no root path, so don't set it at all
 
-            configuration_->mediaPath_  = specialConfig::mediaInstallDirectory;
+            configuration_->dataPath_  = specialConfig::dataInstallDirectory;
 
             // Get user directory

@@ -1 @@
-media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
+data_stripped https://svn.orxonox.net/game/data/branches/media_stripped