Changeset 708 for code/branches/FICN/src/orxonox/Orxonox.cc

Timestamp:

Dec 28, 2007, 10:30:29 PM (18 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/Orxonox.cc (modified) (16 diffs)

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

@@ -32 +32 @@
 
 //****** OGRE ******
-#include <OgreString.h>
 #include <OgreException.h>
 #include <OgreRoot.h>
@@ -47 +46 @@
 
 //****** STD *******
-#include <string>
 #include <iostream>
 #include <exception>
 
 //***** ORXONOX ****
+//misc
+#include "misc/Sleep.h"
+
 // loader and audio
 #include "loader/LevelLoader.h"
@@ -77 +78 @@
 namespace orxonox
 {
-  using namespace Ogre;
-
    // put this in a seperate Class or solve the problem in another fashion
-  class OrxListener : public FrameListener
+  class OrxListener : public Ogre::FrameListener
   {
     public:
@@ -90 +89 @@
       }
 
-      bool frameStarted(const FrameEvent& evt)
+      bool frameStarted(const Ogre::FrameEvent& evt)
       {
         auMan_->update();
@@ -154 +153 @@
    * @param path path to config (in home dir or something)
    */
-  void Orxonox::init(int argc, char **argv, std::string path)
+  void Orxonox::init(int argc, char **argv, String path)
   {
     //TODO: find config file (assuming executable directory)
     //TODO: read config file
     //TODO: give config file to Ogre
-    std::string mode;
+    String mode;
 //     if(argc>=2)
-//       mode = std::string(argv[1]);
+//       mode = String(argv[1]);
 //     else
 //       mode = "";
@@ -170 +169 @@
     //mode = "presentation";
     if(ar.errorHandling()) die();
-    if(mode == std::string("server"))
+    if(mode == String("server"))
     {
       serverInit(path);
       mode_ = SERVER;
     }
-    else if(mode == std::string("client"))
+    else if(mode == String("client"))
     {
       clientInit(path);
       mode_ = CLIENT;
     }
-    else if(mode == std::string("presentation"))
+    else if(mode == String("presentation"))
     {
       serverInit(path);
@@ -244 +243 @@
   }
 
-  void Orxonox::standaloneInit(std::string path)
+  void Orxonox::standaloneInit(String path)
   {
     ogre_->setConfigPath(path);
@@ -263 +262 @@
   }
 
-  void Orxonox::playableServer(std::string path)
+  void Orxonox::playableServer(String path)
   {
     ogre_->setConfigPath(path);
@@ -297 +296 @@
   }
 
-  void Orxonox::serverInit(std::string path)
+  void Orxonox::serverInit(String path)
   {
     COUT(2) << "initialising server" << std::endl;
@@ -307 +306 @@
   }
 
-  void Orxonox::clientInit(std::string path)
+  void Orxonox::clientInit(String path)
   {
     COUT(2) << "initialising client" << std::endl;
@@ -322 +321 @@
   void Orxonox::defineResources()
   {
-    Ogre::String secName, typeName, archName;
+    String secName, typeName, archName;
     Ogre::ConfigFile cf;
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
@@ -341 +340 @@
         archName = i->second;
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-        ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
 #else
-        ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
 #endif
       }
@@ -352 +351 @@
   {
     if (!root_->restoreConfig() && !root_->showConfigDialog())
-      throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
+      throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
   }
 
@@ -362 +361 @@
   void Orxonox::initializeResourceGroups()
   {
-    TextureManager::getSingleton().setDefaultNumMipmaps(5);
-    ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+    Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
+    Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
   }
 
@@ -381 +380 @@
     loader_->loadLevel();
 
-    Overlay* hudOverlay = OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    hud::HUD* orxonoxHud;
-    orxonoxHud = new hud::HUD();
+    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    HUD* orxonoxHud;
+    orxonoxHud = new HUD();
     orxonoxHud->setEnergyValue(20);
     orxonoxHud->setEnergyDistr(20,20,60);
@@ -427 +426 @@
     // fixes auto repeat problem
     #if defined OIS_LINUX_PLATFORM
-      pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+      pl.insert(std::make_pair(String("XAutoRepeatOn"), String("true")));
     #endif
 
-    RenderWindow *win = ogre_->getRoot()->getAutoCreatedWindow();
+      Ogre::RenderWindow *win = ogre_->getRoot()->getAutoCreatedWindow();
     win->getCustomAttribute("WINDOW", &windowHnd);
     windowHndStr << windowHnd;
-    pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
+    pl.insert(std::make_pair(String("WINDOW"), windowHndStr.str()));
     inputManager_ = OIS::InputManager::createInputSystem(pl);