Changeset 911

Timestamp:

Mar 20, 2008, 3:56:23 PM (16 years ago)

Author:

bknecht

Message:

applied some old changes (compiles, but may fail running)

Location:

code/branches/script

Files:

• Media (deleted)
• src/orxonox/GraphicsEngine.cc (modified) (5 diffs)
• src/orxonox/GraphicsEngine.h (modified) (4 diffs)
• src/orxonox/Orxonox.cc (modified) (6 diffs)
• src/orxonox/Orxonox.h (modified) (1 diff)

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

@@ -36 +36 @@
 #include <OgreTextureManager.h>
 
+#include "core/CoreIncludes.h"
 #include "core/Debug.h"
 #include "GraphicsEngine.h"
@@ -46 +47 @@
   GraphicsEngine::GraphicsEngine()
   {
+    RegisterObject(GraphicsEngine);
+    this->bOverwritePath_ = false;
+    this->setConfigValues();
     // set to standard values
     this->configPath_ = "";
-    this->dataPath_ = "";
     scene_ = NULL;
   }
@@ -55 +58 @@
   GraphicsEngine::~GraphicsEngine()
   {
+  }
+
+  void GraphicsEngine::setConfigValues()
+  {
+    SetConfigValue(dataPath_, dataPath_).description("relative path to media data");
+    //if(this->bOverwritePath_)
+      ResetConfigValue(dataPath_);
+
   }
 
@@ -87 +98 @@
   }
 
-  bool GraphicsEngine::load()
+  bool GraphicsEngine::load(std::string dataPath)
   {
+    if( dataPath != "" ) {
+      dataPath_ = dataPath;
+      bOverwritePath_ = true;
+      setConfigValues();
+    }
     loadRessourceLocations(this->dataPath_);
     if (!root_->restoreConfig() && !root_->showConfigDialog())
@@ -108 +124 @@
     // 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

@@ -14 +14 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/BaseObject.h"
 
 
@@ -21 +22 @@
    * graphics engine manager class
  */
-  class _OrxonoxExport GraphicsEngine {
+  class _OrxonoxExport GraphicsEngine : public BaseObject
+  {
     public:
       GraphicsEngine();
@@ -27 +29 @@
       // find a better way for this
       inline Ogre::Root* getRoot() { return root_; };
+      void setConfigValues();
       void setup();
-      bool load();
+      bool load(std::string path);
       void loadRessourceLocations(std::string path);
       Ogre::SceneManager* getSceneManager();
@@ -39 +42 @@
       std::string         dataPath_;    //!< path to data file
       Ogre::SceneManager* scene_;       //!< scene manager of the game
+      bool               bOverwritePath_; //!< overwrites path
 
   };

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

@@ -251 +251 @@
     ogre_->setup();
     root_ = ogre_->getRoot();
-    if(!ogre_->load()) die(/* unable to load */);
+    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
 
     //defineResources();
@@ -270 +270 @@
     ogre_->setup();
     root_ = ogre_->getRoot();
-    defineResources();
-    setupRenderSystem();
+    ogre_->load(this->dataPath_);
+    /*setupRenderSystem();
     createRenderWindow();
-    initializeResourceGroups();
+    initializeResourceGroups();*/
     setupInputSystem();
     Factory::createClassHierarchy();
@@ -305 +305 @@
     ogre_->setup();
     server_g = new network::Server(); // FIXME add some settings if wanted
-    if(!ogre_->load()) die(/* unable to load */);
+    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
     // FIXME add network framelistener
   }
@@ -318 +318 @@
     else
       client_g = new network::Client(serverIp_, 55556);
-    if(!ogre_->load()) die(/* unable to load */);
+    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
     ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
   }
-
+/*
   void Orxonox::defineResources()
   {
@@ -349 +349 @@
       }
     }
-  }
-
+  }*/
+/*
   void Orxonox::setupRenderSystem()
   {
     if (!root_->restoreConfig() && !root_->showConfigDialog())
       throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
-  }
-
+  }*/
+/*
   void Orxonox::createRenderWindow()
   {
@@ -366 +366 @@
     Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
     Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-  }
+  }*/
 
   /**

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

@@ -56 +56 @@
       void playableServer(std::string path);
       void standalone();
-      void defineResources();
-      void setupRenderSystem();
-      void createRenderWindow();
-      void initializeResourceGroups();
+      //void setupRenderSystem();
+      //void createRenderWindow();
+      //void initializeResourceGroups();
       void createScene(void);
       void setupScene();