Changeset 924 for code/branches

Timestamp:

Mar 25, 2008, 11:05:52 PM (17 years ago)

Author:

bknecht

Message:

those changes enable setting the data-repos via arguments and ini-file

Location:

code/branches/script/src/orxonox

Files:

• GraphicsEngine.cc (modified) (5 diffs)
• GraphicsEngine.h (modified) (1 diff)

code/branches/script/src/orxonox/GraphicsEngine.cc

@@ -48 +48 @@
   {
     RegisterObject(GraphicsEngine);
-    this->bOverwritePath_ = false;
+    //this->bOverwritePath_ = false;
     this->setConfigValues();
     // set to standard values
@@ -63 +63 @@
   {
     SetConfigValue(dataPath_, dataPath_).description("relative path to media data");
-    //if(this->bOverwritePath_)
-      ResetConfigValue(dataPath_);
 
   }
@@ -100 +98 @@
   bool GraphicsEngine::load(std::string dataPath)
   {
-    if( dataPath != "" ) {
+    // temporary overwrite of dataPath, change ini file for permanent change
+    if( dataPath != "" )
       dataPath_ = dataPath;
-      bOverwritePath_ = true;
-      setConfigValues();
-    }
     loadRessourceLocations(this->dataPath_);
     if (!root_->restoreConfig() && !root_->showConfigDialog())
@@ -115 +111 @@
     root_->initialise(true, "OrxonoxV2");
     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();
   }
@@ -124 +121 @@
     // Load resource paths from data file using configfile ressource type
     ConfigFile cf;
-    /*dataPath = "/home/piranha/orxonox/trunk/";
-    //dataPath += "resources.cfg";
-    std::cout << "*******************" << std::endl;
-    std::cout << dataPath << std::endl;
-    std::cout << "*******************" << std::endl;*/
     cf.load(dataPath + "resources.cfg");
 

code/branches/script/src/orxonox/GraphicsEngine.h

@@ -42 +42 @@
       std::string         dataPath_;    //!< path to data file
       Ogre::SceneManager* scene_;       //!< scene manager of the game
-      bool               bOverwritePath_; //!< overwrites path
+      //bool               bOverwritePath_; //!< overwrites path
 
   };