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

Timestamp:

Dec 28, 2007, 10:30:29 PM (17 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.cc (modified) (2 diffs)

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

@@ -65 +65 @@
 #endif*/
 #if defined(_DEBUG) && defined(WIN32)
-    std::string plugin_filename = "plugins_d.cfg";
+    String plugin_filename = "plugins_d.cfg";
 #else
-    std::string plugin_filename = "plugins.cfg";
+    String plugin_filename = "plugins.cfg";
 #endif
     root_ = new Root(plugin_filename);
@@ -100 +100 @@
   }
 
-  void GraphicsEngine::loadRessourceLocations(std::string dataPath)
+  void GraphicsEngine::loadRessourceLocations(String dataPath)
   {
     //TODO: Specify layout of data file and maybe use xml-loader