Changeset 708 for code/branches/FICN/src/orxonox/objects/Ambient.cc

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/objects/Ambient.cc (modified) (2 diffs)

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

@@ -26 +26 @@
  */
 
+#include <vector>
+
 #include <OgreSceneManager.h>
-#include <string>
 
+#include "tinyxml/tinyxml.h"
+#include "misc/Tokenizer.h"
+#include "misc/String2Number.h"
+#include "misc/ColourValue.h"
+#include "misc/String.h"
+#include "../core/Debug.h"
+#include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
-#include "../../tinyxml/tinyxml.h"
-#include "../../misc/Tokenizer.h"
-#include "../../misc/String2Number.h"
-#include "../core/Debug.h"
 
 #include "Ambient.h"
@@ -57 +61 @@
         {
 
-                std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
+                std::vector<String> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
                 float r, g, b;
                 String2Number<float>(r, colourvalues[0]);