Changeset 1064 for code/trunk/src/orxonox/objects

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 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

Location:

code/trunk/src/orxonox/objects

Files:

• Ambient.cc (modified) (2 diffs)
• Camera.cc (modified) (3 diffs)
• Model.cc (modified) (1 diff)
• Skybox.cc (modified) (1 diff)
• SpaceShip.cc (modified) (3 diffs)
• WorldEntity.cc (modified) (1 diff)

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));

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

@@ -38 +38 @@
 
 #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"
@@ -73 +73 @@
 
         float x, y, z;
-        std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
-        String2Number<float>(x, posVec[0]);
-        String2Number<float>(y, posVec[1]);
-        String2Number<float>(z, posVec[2]);
+        SubString posVec(xmlElem->Attribute("pos"), ',');
+        convertValue<std::string, float>(&x, posVec[0]);
+        convertValue<std::string, float>(&y, posVec[1]);
+        convertValue<std::string, float>(&z, posVec[2]);
 
         cam->setPosition(Vector3(x,y,z));
 
-        posVec = tokenize(xmlElem->Attribute("lookat"),",");
-        String2Number<float>(x, posVec[0]);
-        String2Number<float>(y, posVec[1]);
-        String2Number<float>(z, posVec[2]);
+        posVec = SubString(xmlElem->Attribute("lookat"), ',');
+        convertValue<std::string, float>(&x, posVec[0]);
+        convertValue<std::string, float>(&y, posVec[1]);
+        convertValue<std::string, float>(&z, posVec[2]);
 
         cam->lookAt(Vector3(x,y,z));
@@ -93 +93 @@
 
         // FIXME: unused var
-        Ogre::Viewport* vp = GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+        //Ogre::Viewport* vp = 
+        GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
 
 

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

@@ -31 +31 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"

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

@@ -35 +35 @@
 
 #include "util/tinyxml/tinyxml.h"
-//#include "util/Tokenizer.h"
-//#include "util/String2Number.h"
 #include "GraphicsEngine.h"
 #include "core/CoreIncludes.h"

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

@@ -39 +39 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/String2Number.h"
+#include "util/Convert.h"
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
@@ -259 +259 @@
             std::string rdStr = xmlElem->Attribute("rotDamp");
 
-            String2Number<float>(this->maxSpeed_, msStr);
-            String2Number<float>(this->maxSideAndBackSpeed_, msabsStr);
-            String2Number<float>(this->maxRotation_, mrStr);
-            String2Number<float>(this->translationAcceleration_, taStr);
-            String2Number<float>(this->rotationAcceleration_, raStr);
-            String2Number<float>(this->translationDamping_, tdStr);
-            String2Number<float>(this->rotationDamping_, rdStr);
+            convertValue<std::string, float>(&this->maxSpeed_, msStr);
+            convertValue<std::string, float>(&this->maxSideAndBackSpeed_, msabsStr);
+            convertValue<std::string, float>(&this->maxRotation_, mrStr);
+            convertValue<std::string, float>(&this->translationAcceleration_, taStr);
+            convertValue<std::string, float>(&this->rotationAcceleration_, raStr);
+            convertValue<std::string, float>(&this->translationDamping_, tdStr);
+            convertValue<std::string, float>(&this->rotationDamping_, rdStr);
 
             this->maxRotationRadian_ = Radian(this->maxRotation_);
@@ -458 +458 @@
 
         OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
-        OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();
+        //FIXME: variable never used
+        //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();
 
 

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

@@ -34 +34 @@
 
 #include "util/tinyxml/tinyxml.h"
-#include "util/Tokenizer.h"
-#include "util/String2Number.h"
+#include "util/SubString.h"
 #include "core/CoreIncludes.h"
 #include "GraphicsEngine.h"