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

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.h (modified) (5 diffs)

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

@@ -13 +13 @@
 #include "OrxonoxPrereqs.h"
 #include "loader/LoaderPrereqs.h"
+
+#include "misc/String.h"
 #include "GraphicsEngine.h"
 
@@ -30 +32 @@
   {
     public:
-      void init(int argc, char **argv, std::string path);
+      void init(int argc, char **argv, String path);
       void start();
       // not sure if this should be private
@@ -46 +48 @@
       virtual ~Orxonox();
       // init functions
-      void serverInit(std::string path);
-      void clientInit(std::string path);
-      void standaloneInit(std::string path);
+      void serverInit(String path);
+      void clientInit(String path);
+      void standaloneInit(String path);
       // run functions
-      void playableServer(std::string path);
+      void playableServer(String path);
       void standalone();
       void defineResources();
@@ -64 +66 @@
     private:
       GraphicsEngine*       ogre_;      //!< our dearest graphics engine <3
-      std::string           dataPath_;  //!< path to data
+      String           dataPath_;  //!< path to data
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
@@ -77 +79 @@
       // this is used to identify the mode (server/client/...) we're in
       gameMode              mode_;
-      std::string           serverIp_;
+      String           serverIp_;
   };
 }