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

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

@@ -3 +3 @@
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
+#include <OgreViewport.h>
 
-#include <string>
-
+#include "tinyxml/tinyxml.h"
+#include "misc/Tokenizer.h"
+#include "misc/String2Number.h"
+#include "misc/Vector3.h"
+#include "misc/String.h"
+#include "../core/Debug.h"
+#include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
 #include "../GraphicsEngine.h"
-#include "../../tinyxml/tinyxml.h"
-#include "../../misc/Tokenizer.h"
-#include "../../misc/String2Number.h"
-#include "../core/Debug.h"
 
 #include "Camera.h"
@@ -36 +38 @@
         //    <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
 
-        std::string name = xmlElem->Attribute("name");
-        std::string pos = xmlElem->Attribute("pos");
-        std::string lookat = xmlElem->Attribute("lookat");
+        String name = xmlElem->Attribute("name");
+        String pos = xmlElem->Attribute("pos");
+        String lookat = xmlElem->Attribute("lookat");
 
         Ogre::Camera *cam = mgr->createCamera(name);
 
         float x, y, z;
-        std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
-         String2Number<float>(x, posVec[0]);
+        std::vector<String> posVec = tokenize(xmlElem->Attribute("pos"),",");
+        String2Number<float>(x, posVec[0]);
         String2Number<float>(y, posVec[1]);
         String2Number<float>(z, posVec[2]);
@@ -57 +59 @@
         cam->lookAt(Vector3(x,y,z));
 
-        std::string node = xmlElem->Attribute("node");
+        String node = xmlElem->Attribute("node");
 
         Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);