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

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 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/GraphicsEngine.h (modified) (3 diffs)

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

@@ -11 +11 @@
 #include <OgreSceneManager.h>
 
+#include "misc/String.h"
+
 
 namespace orxonox {
@@ -20 +22 @@
     public:
       GraphicsEngine();
-      inline void setConfigPath(std::string path) { this->configPath_ = path; };
+      inline void setConfigPath(String path) { this->configPath_ = path; };
       // find a better way for this
       inline Ogre::Root* getRoot() { return root_; };
       void setup();
       bool load();
-      void loadRessourceLocations(std::string path);
+      void loadRessourceLocations(String path);
       Ogre::SceneManager* getSceneManager();
       void startRender();
@@ -32 +34 @@
     private:
       Ogre::Root*         root_;        //!< Ogre's root
-      std::string         configPath_;  //!< path to config file
-      std::string         dataPath_;    //!< path to data file
+      String         configPath_;  //!< path to config file
+      String         dataPath_;    //!< path to data file
       Ogre::SceneManager* scene_;       //!< scene manager of the game