Changeset 618 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 18, 2007, 4:47:58 PM (17 years ago)

Author:

nicolasc

Message:

• changed comments to doxygen tags in flocking
• reduced ogre depency in HUD and ParticleInterface
• various

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Camera.cc (modified) (1 diff)
• SceneNode.cc (modified) (2 diffs)

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

@@ -30 +30 @@
     void Camera::loadParams(TiXmlElement* xmlElem)
     {
-        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
+      Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
 
-        if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
-        {
-                //              <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
+      if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
+      {
+        //    <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");
+        std::string name = xmlElem->Attribute("name");
+        std::string pos = xmlElem->Attribute("pos");
+        std::string lookat = xmlElem->Attribute("lookat");
 
-                Ogre::Camera *cam = mgr->createCamera(name);
+        Ogre::Camera *cam = mgr->createCamera(name);
 
-                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]);
+        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]);
 
-                cam->setPosition(Vector3(x,y,z));
+        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 = tokenize(xmlElem->Attribute("lookat"),",");
+        String2Number<float>(x, posVec[0]);
+        String2Number<float>(y, posVec[1]);
+        String2Number<float>(z, posVec[2]);
 
-                cam->lookAt(Vector3(x,y,z));
+        cam->lookAt(Vector3(x,y,z));
 
-                std::string node = xmlElem->Attribute("node");
+        std::string node = xmlElem->Attribute("node");
 
-                    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
-                    sceneNode->attachObject((Ogre::MovableObject*)cam);
+        Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
+        sceneNode->attachObject((Ogre::MovableObject*)cam);
 
 
-                    Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+        Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
 
 
-                COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
-        }
+        COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
+      }
    }
 }

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

@@ -25 +25 @@
     void SceneNode::loadParams(TiXmlElement* xmlElem)
     {
-        if (xmlElem->Attribute("name") && xmlElem->Attribute("pos"))
-        {
-                name_ = xmlElem->Attribute("name");
+      if (xmlElem->Attribute("name") && xmlElem->Attribute("pos"))
+      {
+        name_ = xmlElem->Attribute("name");
 
-                std::vector<std::string> pos = tokenize(xmlElem->Attribute("pos"),",");
-                //float x, y, z_;
-                String2Number<float>(x_, pos[0]);
-                String2Number<float>(y_, pos[1]);
-                String2Number<float>(z_, pos[2]);
+        std::vector<std::string> pos = tokenize(xmlElem->Attribute("pos"),",");
+        //float x, y, z_;
+         String2Number<float>(x_, pos[0]);
+        String2Number<float>(y_, pos[1]);
+        String2Number<float>(z_, pos[2]);
 
         sx_ = 1; sy_ = 1; sz_ = 1;
         if (xmlElem->Attribute("scale"))
         {
-                  pos = tokenize(xmlElem->Attribute("scale"),",");
-                  String2Number<float>(sx_, pos[0]);
-                  String2Number<float>(sy_, pos[1]);
-                  String2Number<float>(sz_, pos[2]);
+          pos = tokenize(xmlElem->Attribute("scale"),",");
+           String2Number<float>(sx_, pos[0]);
+          String2Number<float>(sy_, pos[1]);
+          String2Number<float>(sz_, pos[2]);
         }
         yaw_ = 0.0;
@@ -67 +67 @@
 
         COUT(4) << "Loader: loaded node "<< name_ <<" : "<< x_ <<" " << y_ << " " << z_ << std::endl << std::endl;
-        }
+      }
    }