Changeset 473

Timestamp:

Dec 12, 2007, 6:11:30 PM (16 years ago)

Author:

bknecht

Message:

should work again, sorry

Location:

code/branches/FICN/src/orxonox

Files:

• graphicsEngine.cc (modified) (3 diffs)
• main.cc (modified) (1 diff)
• orxonox.cc (modified) (4 diffs)
• orxonox.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/graphicsEngine.cc

@@ -46 +46 @@
     this->configPath_ = "";
     this->dataPath_ = "";
+    scene_ = NULL;
   }
 
@@ -56 +57 @@
   {
     //TODO: Check if file exists (maybe not here)
-#ifndef OGRE_STATIC_LIB
+/*#ifndef OGRE_STATIC_LIB
     root_ = new Root(configPath_ + "plugins.cfg", configPath_ + "ogre.cfg",
                      configPath_ + "Ogre.log");
-#endif
+#else
     root_ = new Root(NULL, configPath_ + "ogre.cfg", configPath_ + "Ogre.log");
+#endif*/
+    root_ = new Root();
   }
 
   /**
-   * returns scene manager
+   * @return scene manager
    */
   SceneManager* GraphicsEngine::getSceneManager()
   {
     if(!scene_)
+    {
       scene_ = root_->createSceneManager(ST_GENERIC, "Default SceneManager");
+      std::cout << "created SceneMan: " << scene_ << std::endl;
+    }
     return scene_;
   }
@@ -94 +100 @@
     // Load resource paths from data file using configfile ressource type
     ConfigFile cf;
-    cf.load(dataPath_ + "resources.cfg");
+    cf.load(dataPath + "resources.cfg");
 
     // Go through all sections & settings in the file

code/branches/FICN/src/orxonox/main.cc

@@ -81 +81 @@
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
     orx->init(argc, argv, macBundlePath());
-    orx->start();
+    //orx->start();
 #else
     orx->init(argc, argv, "");
-    orx->start();
+    //orx->start();
 #endif
 

code/branches/FICN/src/orxonox/orxonox.cc

@@ -63 +63 @@
 #include "../network/Server.h"
 #include "../network/Client.h"
-//#include "../network/NetworkFrameListener.h"
+#include "../network/NetworkFrameListener.h"
 
 // some tests to see if enet works without includsion
@@ -222 +222 @@
     // load this file from config
     string levelFile = "sample.oxw";
-    loader_ = new loader::LevelLoader(levelFile);
+    //loader_ = new loader::LevelLoader(levelFile);
     //TODO: run engine
   }
@@ -248 +248 @@
     ogre_->setConfigPath(path);
     ogre_->setup();
-    if(!ogre_->load()) die(/* unable to load */);
-  }
-
-  void Orxonox::serverInit(std::string path)
-  {
-    ogre_->setConfigPath(path);
-    ogre_->setup();
-    //server_g = new network::Server(); // add some settings if wanted
-    if(!ogre_->load()) die(/* unable to load */);
-    //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
-    ogre_->startRender();
-
-    createScene();
-    setupScene();
-  }
-
-  void Orxonox::clientInit(std::string path)
-  {
-    ogre_->setConfigPath(path);
-    ogre_->setup();
-    //client_g = new network::Client(); // address here
-    if(!ogre_->load()) die(/* unable to load */);
-    //ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
-    ogre_->startRender();
-
+    root_ = ogre_->getRoot();
+    //if(!ogre_->load()) die(/* unable to load */);
+
+    defineResources();
+    setupRenderSystem();
+    createRenderWindow();
+    initializeResourceGroups();
     createScene();
     setupScene();
@@ -278 +260 @@
     createFrameListener();
     startRenderLoop();
+  }
+
+  void Orxonox::serverInit(std::string path)
+  {
+    ogre_->setConfigPath(path);
+    ogre_->setup();
+    server_g = new network::Server(); // add some settings if wanted
+    if(!ogre_->load()) die(/* unable to load */);
+    //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
+    ogre_->startRender();
+
+    createScene();
+    setupScene();
+  }
+
+  void Orxonox::clientInit(std::string path)
+  {
+    ogre_->setConfigPath(path);
+    ogre_->setup();
+    client_g = new network::Client(); // address here
+    if(!ogre_->load()) die(/* unable to load */);
+    //ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
+    ogre_->startRender();
+
+    createScene();
+    setupScene();
+    setupInputSystem();
+    createFrameListener();
+    startRenderLoop();
+  }
+
+  void Orxonox::defineResources()
+  {
+    Ogre::String secName, typeName, archName;
+    Ogre::ConfigFile cf;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+    cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
+#else
+    cf.load("resources.cfg");
+#endif
+
+    Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
+    while (seci.hasMoreElements())
+    {
+      secName = seci.peekNextKey();
+      Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+      Ogre::ConfigFile::SettingsMultiMap::iterator i;
+      for (i = settings->begin(); i != settings->end(); ++i)
+      {
+        typeName = i->first;
+        archName = i->second;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
+#else
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
+#endif
+      }
+    }
+  }
+
+  void Orxonox::setupRenderSystem()
+  {
+    if (!root_->restoreConfig() && !root_->showConfigDialog())
+      throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
+  }
+
+  void Orxonox::createRenderWindow()
+  {
+    root_->initialise(true, "OrxonoxV2");
+  }
+
+  void Orxonox::initializeResourceGroups()
+  {
+    TextureManager::getSingleton().setDefaultNumMipmaps(5);
+    ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
   }
 

code/branches/FICN/src/orxonox/orxonox.h

@@ -39 +39 @@
       void clientInit(std::string path);
       void standalone(std::string path);
+      void defineResources();
+      void setupRenderSystem();
+      void createRenderWindow();
+      void initializeResourceGroups();
       void createScene(void);
       void setupScene();
@@ -46 +50 @@
     private:
 
-      //static Orxonox*       singletonRef_;
       GraphicsEngine*       ogre_;      //!< our dearest graphics engine <3
       std::string           dataPath_;  //!< path to data
@@ -56 +59 @@
       OIS::InputManager*    inputManager_;
       OrxListener*          frameListener_;
+      Ogre::Root*           root_;
   };
 }