Changeset 708 for code/branches/FICN/src/orxonox/objects/WorldEntity.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/objects/WorldEntity.cc (modified) (5 diffs)

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -26 +26 @@
  */
 
-#include <string>
 #include <sstream>
 
-#include "WorldEntity.h"
+#include "tinyxml/tinyxml.h"
+#include "misc/Tokenizer.h"
+#include "misc/String2Number.h"
+#include "misc/String.h"
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
-#include "../../tinyxml/tinyxml.h"
-#include "../../misc/Tokenizer.h"
-#include "../../misc/String2Number.h"
+#include "WorldEntity.h"
 
 namespace orxonox
@@ -88 +88 @@
         if (xmlElem->Attribute("position"))
         {
-            std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
+            std::vector<String> pos = tokenize(xmlElem->Attribute("position"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);
@@ -98 +98 @@
         if (xmlElem->Attribute("direction"))
         {
-            std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
+            std::vector<String> pos = tokenize(xmlElem->Attribute("direction"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);
@@ -125 +125 @@
         if (xmlElem->Attribute("scale"))
         {
-            std::string scaleStr = xmlElem->Attribute("scale");
+            String scaleStr = xmlElem->Attribute("scale");
             float scale;
             String2Number<float>(scale, scaleStr);
@@ -133 +133 @@
         if (xmlElem->Attribute("rotationAxis"))
         {
-            std::vector<std::string> pos = tokenize(xmlElem->Attribute("rotationAxis"),",");
+            std::vector<String> pos = tokenize(xmlElem->Attribute("rotationAxis"),",");
             float x, y, z;
             String2Number<float>(x, pos[0]);