Changeset 1212 for code/branches/network3/src/orxonox/objects/SpaceShip.cc

Timestamp:

May 1, 2008, 6:09:54 PM (17 years ago)

Author:

scheusso

Message:

merged camera branch changes from 1101 to 1202 into network branch (we have now a camera manager)

File:

• code/branches/network3/src/orxonox/objects/SpaceShip.cc (modified) (4 diffs)

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -38 +38 @@
 #include <OgreSceneNode.h>
 
+#include "CameraHandler.h"
 #include "util/tinyxml/tinyxml.h"
 #include "util/Convert.h"
@@ -287 +288 @@
     
     void SpaceShip::createCamera(){
-      Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
       this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
+      camNode_->setPosition(this->getNode()->getPosition() + Vector3(-50,0,10));
 /*
 //        node->setInheritOrientation(false);
@@ -295 +296 @@
       cam->roll(Degree(0));
 */
-
-      cam->setPosition(Vector3(-200,0,35));
+      cam_ = new Camera(this->camNode_);
+      cam_->setTargetNode(this->getNode());
+      CameraHandler::getInstance()->requestFocus(cam_);
 //        cam->setPosition(Vector3(0,-350,0));
-      cam->lookAt(Vector3(0,0,35));
-      cam->roll(Degree(-90));
-
-      this->camNode_->attachObject(cam);
-      GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+      //cam->roll(Degree(-90));
+
+      //this->camNode_->attachObject(cam);
       
     }