Changeset 1064 for code/trunk/src/orxonox/objects/Ambient.cc

Timestamp:

Apr 14, 2008, 9:39:57 PM (16 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

File:

• code/trunk/src/orxonox/objects/Ambient.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/Ambient.cc

@@ -36 +36 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
+#include "util/SubString.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/Debug.h"
@@ -67 +67 @@
         if (xmlElem->Attribute("colourvalue"))
         {
+        SubString colourvalues(xmlElem->Attribute("colourvalue"), ',');
 
-                std::vector<std::string> colourvalues = tokenize(xmlElem->Attribute("colourvalue"),",");
                 float r, g, b;
-                String2Number<float>(r, colourvalues[0]);
-                String2Number<float>(g, colourvalues[1]);
-                String2Number<float>(b, colourvalues[2]);
+        convertValue<std::string, float>(&r, colourvalues[0]);
+        convertValue<std::string, float>(&g, colourvalues[1]);
+        convertValue<std::string, float>(&b, colourvalues[2]);
 
                 this->setAmbientLight(ColourValue(r, g, b));