Changeset 708 for code/branches/FICN/src/loader

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..

Location:

code/branches/FICN/src/loader

Files:

• LevelLoader.cc (modified) (2 diffs)
• LevelLoader.h (modified) (3 diffs)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -42 +42 @@
 {
 
-  LevelLoader::LevelLoader(std::string file, std::string path)
+  LevelLoader::LevelLoader(orxonox::String file, orxonox::String path)
   {
     valid_ = false;
@@ -155 +155 @@
 
               tElem = tNode->ToElement();
-              std::string elemVal = tElem->Value();
+              orxonox::String elemVal = tElem->Value();
               if (elemVal == "ogg")
               {

code/branches/FICN/src/loader/LevelLoader.h

@@ -9 +9 @@
 #define _LevelLoader_H__
 
-#include <string>
+#include "LoaderPrereqs.h"
 
-#include "LoaderPrereqs.h"
+#include "misc/String.h"
 #include "tinyxml/tinyxml.h"
 
@@ -23 +23 @@
   public:
     // Constructors, loads the level file and some information data
-    LevelLoader(std::string file, std::string dir = "levels");
+    LevelLoader(orxonox::String file, orxonox::String dir = "levels");
     // Destructor
     virtual ~LevelLoader();
@@ -30 +30 @@
 
     // Getters
-    inline std::string name() {return name_; };
-    inline std::string description() {return description_; };
-    inline std::string image() {return image_; };
+    inline orxonox::String name() {return name_; };
+    inline orxonox::String description() {return description_; };
+    inline orxonox::String image() {return image_; };
   private:
     //! Level information
-    std::string name_;
-    std::string description_;
-    std::string image_;
-    std::string loadingBackgroundColor_;
-    std::string loadingBackgroundImage_;
-    std::string loadingBarImage_;
-    std::string loadingBarTop_;
-    std::string loadingBarLeft_;
-    std::string loadingBarWidth_;
-    std::string loadingBarHeight_;
+    orxonox::String name_;
+    orxonox::String description_;
+    orxonox::String image_;
+    orxonox::String loadingBackgroundColor_;
+    orxonox::String loadingBackgroundImage_;
+    orxonox::String loadingBarImage_;
+    orxonox::String loadingBarTop_;
+    orxonox::String loadingBarLeft_;
+    orxonox::String loadingBarWidth_;
+    orxonox::String loadingBarHeight_;
 
     //! Set to true if it was possible to load the level file