Changeset 715 for code/branches/FICN/src/orxonox/objects/Camera.cc

Timestamp:

Dec 28, 2007, 11:33:10 PM (16 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

File:

• code/branches/FICN/src/orxonox/objects/Camera.cc (modified) (4 diffs)

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

@@ +1 @@
+#include <string>
+
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
@@ -9 +11 @@
 #include "misc/String2Number.h"
 #include "misc/Vector3.h"
-#include "misc/String.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"
@@ -38 +39 @@
         //    <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
 
-        String name = xmlElem->Attribute("name");
-        String pos = xmlElem->Attribute("pos");
-        String lookat = xmlElem->Attribute("lookat");
+        std::string name = xmlElem->Attribute("name");
+        std::string pos = xmlElem->Attribute("pos");
+        std::string lookat = xmlElem->Attribute("lookat");
 
         Ogre::Camera *cam = mgr->createCamera(name);
 
         float x, y, z;
-        std::vector<String> posVec = tokenize(xmlElem->Attribute("pos"),",");
+        std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
         String2Number<float>(x, posVec[0]);
         String2Number<float>(y, posVec[1]);
@@ -59 +60 @@
         cam->lookAt(Vector3(x,y,z));
 
-        String node = xmlElem->Attribute("node");
+        std::string node = xmlElem->Attribute("node");
 
         Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);