Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 18, 2007, 4:47:58 PM (16 years ago)
Author:
nicolasc
Message:
  • changed comments to doxygen tags in flocking
  • reduced ogre depency in HUD and ParticleInterface
  • various
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/src/orxonox/objects/Camera.cc

    r614 r618  
    3030    void Camera::loadParams(TiXmlElement* xmlElem)
    3131    {
    32         Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
     32      Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
    3333
    34         if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
    35         {
    36                 //              <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
     34      if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
     35      {
     36        //    <Camera name="Camera" pos="0,0,-250" lookat="0,0,0" />
    3737
    38                 std::string name = xmlElem->Attribute("name");
    39                 std::string pos = xmlElem->Attribute("pos");
    40                 std::string lookat = xmlElem->Attribute("lookat");
     38        std::string name = xmlElem->Attribute("name");
     39        std::string pos = xmlElem->Attribute("pos");
     40        std::string lookat = xmlElem->Attribute("lookat");
    4141
    42                 Ogre::Camera *cam = mgr->createCamera(name);
     42        Ogre::Camera *cam = mgr->createCamera(name);
    4343
    44                 float x, y, z;
    45                 std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
    46                 String2Number<float>(x, posVec[0]);
    47                 String2Number<float>(y, posVec[1]);
    48                 String2Number<float>(z, posVec[2]);
     44        float x, y, z;
     45        std::vector<std::string> posVec = tokenize(xmlElem->Attribute("pos"),",");
     46         String2Number<float>(x, posVec[0]);
     47        String2Number<float>(y, posVec[1]);
     48        String2Number<float>(z, posVec[2]);
    4949
    50                 cam->setPosition(Vector3(x,y,z));
     50        cam->setPosition(Vector3(x,y,z));
    5151
    52                 posVec = tokenize(xmlElem->Attribute("lookat"),",");
    53                 String2Number<float>(x, posVec[0]);
    54                 String2Number<float>(y, posVec[1]);
    55                 String2Number<float>(z, posVec[2]);
     52        posVec = tokenize(xmlElem->Attribute("lookat"),",");
     53        String2Number<float>(x, posVec[0]);
     54        String2Number<float>(y, posVec[1]);
     55        String2Number<float>(z, posVec[2]);
    5656
    57                 cam->lookAt(Vector3(x,y,z));
     57        cam->lookAt(Vector3(x,y,z));
    5858
    59                 std::string node = xmlElem->Attribute("node");
     59        std::string node = xmlElem->Attribute("node");
    6060
    61                     Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
    62                     sceneNode->attachObject((Ogre::MovableObject*)cam);
     61        Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->createChildSceneNode(node); //getChild(node);
     62        sceneNode->attachObject((Ogre::MovableObject*)cam);
    6363
    6464
    65                     Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
     65        Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
    6666
    6767
    68                 COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
    69         }
     68        COUT(4) << "Loader: Created camera "<< name  << std::endl << std::endl;
     69      }
    7070   }
    7171}
Note: See TracChangeset for help on using the changeset viewer.