Changeset 8366 for code/trunk

Timestamp:

Apr 30, 2011, 9:31:02 PM (14 years ago)

Author:

rgrieder

Message:

Renamed PathConfig::isDevelopmentRun() to PathConfig::buildDirectoryRun() because that fits better and there is no confusion with Core::inDevMode().
Also used isDevelopmentRun() as default value for Core::inDevMode() instead of ORXONOX_RELEASE.

Location:

code/trunk/src/libraries

Files:

• core/Core.cc (modified) (3 diffs)
• core/Core.h (modified) (1 diff)
• core/GraphicsManager.cc (modified) (2 diffs)
• core/PathConfig.cc (modified) (3 diffs)
• core/PathConfig.h (modified) (3 diffs)
• core/command/TclBind.cc (modified) (1 diff)
• core/input/KeyBinder.cc (modified) (2 diffs)
• tools/ResourceLocation.cc (modified) (1 diff)

code/trunk/src/libraries/core/Core.cc

@@ -98 +98 @@
         , lastLevelTimestamp_(0)
         , ogreConfigTimestamp_(0)
+        , bDevMode_(false)
     {
         // Set the hard coded fixed paths
@@ -212 +213 @@
 #ifdef ORXONOX_RELEASE
         const unsigned int defaultLevelLogFile = 3;
-        SetConfigValue(bDevMode_, false)
-            .description("Developer mode. If not set, hides some things from the user to not confuse him.");
 #else
         const unsigned int defaultLevelLogFile = 4;
-        SetConfigValue(bDevMode_, true)
-            .description("Developer mode. If not set, hides some things from the user to not confuse him.");
 #endif
         SetConfigValueExternal(softDebugLevelLogFile_, "OutputHandler", "softDebugLevelLogFile", defaultLevelLogFile)
@@ -223 +220 @@
         OutputHandler::getInstance().setSoftDebugLevel(OutputHandler::logFileOutputListenerName_s, this->softDebugLevelLogFile_);
 
+        SetConfigValue(bDevMode_, PathConfig::buildDirectoryRun())
+            .description("Developer mode. If not set, hides some things from the user to not confuse him.");
         SetConfigValue(language_, Language::getInstance().defaultLanguage_)
             .description("The language of the in game text")

code/trunk/src/libraries/core/Core.h

@@ -91 +91 @@
                 { return this->ogreConfigTimestamp_; }
 
+            //! Developers bit. If returns false, some options are not available as to not confuse the normal user.
             inline bool inDevMode(void) const
                 { return this->bDevMode_; }

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -119 +119 @@
         Loader::open(resources_.get());
 
-        // Only for development runs
-        if (PathConfig::isDevelopmentRun())
+        // Only for runs in the build directory (not installed)
+        if (PathConfig::buildDirectoryRun())
             Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getExternalDataPathString(), "FileSystem");
 
@@ -251 +251 @@
         std::string pluginPath = specialConfig::ogrePluginsDirectory;
 #ifdef DEPENDENCY_PACKAGE_ENABLE
-        if (!PathConfig::isDevelopmentRun())
+        if (!PathConfig::buildDirectoryRun())
         {
 #  if defined(ORXONOX_PLATFORM_WINDOWS)

code/trunk/src/libraries/core/PathConfig.cc

@@ -84 +84 @@
         , configPath_(*(new bf::path()))
         , logPath_(*(new bf::path()))
-        , bDevRun_(false)
+        , bBuildDirectoryRun_(false)
     {
         //////////////////////////
@@ -138 +138 @@
         {
             COUT(1) << "Running from the build tree." << std::endl;
-            PathConfig::bDevRun_ = true;
+            PathConfig::bBuildDirectoryRun_ = true;
             modulePath_ = specialConfig::moduleDevDirectory;
         }
@@ -180 +180 @@
     void PathConfig::setConfigurablePaths()
     {
-        if (bDevRun_)
+        if (bBuildDirectoryRun_)
         {
             dataPath_         = specialConfig::dataDevDirectory;

code/trunk/src/libraries/core/PathConfig.h

@@ -114 +114 @@
 
             //! Return true for runs in the build directory (not installed)
-            static bool isDevelopmentRun() { return getInstance().bDevRun_; }
+            static bool buildDirectoryRun() { return getInstance().bBuildDirectoryRun_; }
 
         private:
@@ -129 +129 @@
             std::vector<std::string> getModulePaths();
 
-            //! Path to the parent directory of the ones above if program was installed with relativ paths
+            //! Path to the parent directory of the ones above if program was installed with relative paths
             boost::filesystem::path& rootPath_;
             boost::filesystem::path& executablePath_;        //!< Path to the executable
@@ -138 +138 @@
             boost::filesystem::path& logPath_;               //!< Path to the log files folder
 
-            bool                     bDevRun_;               //!< True for runs in the build directory (not installed)
+            bool                     bBuildDirectoryRun_;    //!< True for runs in the build directory (not installed)
             static PathConfig* singletonPtr_s;
     }; //tolua_export

code/trunk/src/libraries/core/command/TclBind.cc

@@ -140 +140 @@
     {
 #ifdef DEPENDENCY_PACKAGE_ENABLE
-        if (PathConfig::isDevelopmentRun())
+        if (PathConfig::buildDirectoryRun())
             return (std::string(specialConfig::dependencyLibraryDirectory) + "/tcl");
         else
-            return (PathConfig::getRootPathString() + "lib/tcl");
+            return (PathConfig::getRootPathString() + specialConfig::defaultLibraryPath + "/tcl");
 #else
         return "";

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -253 +253 @@
         COUT(3) << "KeyBinder: Loading key bindings..." << std::endl;
 
-        this->configFile_ = new ConfigFile(this->filename_, !PathConfig::isDevelopmentRun());
+        this->configFile_ = new ConfigFile(this->filename_, !PathConfig::buildDirectoryRun());
         this->configFile_->load();
 
-        if (PathConfig::isDevelopmentRun())
+        if (PathConfig::buildDirectoryRun())
         {
             // Dev users should have combined key bindings files
@@ -287 +287 @@
             addButtonToCommand(binding, it->second);
             std::string str = binding;
-            if (PathConfig::isDevelopmentRun() && binding.empty())
+            if (PathConfig::buildDirectoryRun() && binding.empty())
                 str = "NoBinding";
             it->second->setBinding(this->configFile_, this->fallbackConfigFile_, binding, bTemporary);

code/trunk/src/libraries/tools/ResourceLocation.cc

@@ -76 +76 @@
         if (bf::exists(PathConfig::getDataPath() / this->getPath()))
             path = PathConfig::getDataPath() / this->getPath();
-        else if (PathConfig::isDevelopmentRun() && bf::exists(PathConfig::getExternalDataPath() / this->getPath()))
+        else if (PathConfig::buildDirectoryRun() && bf::exists(PathConfig::getExternalDataPath() / this->getPath()))
             path = PathConfig::getExternalDataPath() / this->getPath();
         else