Changeset 1289 for code/branches/merge/src/orxonox/objects/SpaceShip.cc

Timestamp:

May 15, 2008, 4:43:20 PM (17 years ago)

Author:

scheusso

Message:

merged camera change into merger branch

File:

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

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

@@ -106 +106 @@
         this->setConfigValues();
 
+
         this->setRotationAxis(1, 0, 0);
         this->setStatic(false);
@@ -118 +119 @@
         if(setMouseEventCallback_)
           InputManager::removeMouseHandler("SpaceShip");
+        if (this->cam_)
+          delete this->cam_;
     }
 
@@ -286 +289 @@
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
       COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
-      this->camNode_->setPosition(/*this->getNode()->getPosition() +*/ Vector3(-50,0,10));
+      this->camNode_->setPosition(Vector3(-50,0,10));
+      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
+      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,0,-1));
+      camNode_->setOrientation(q1*q2);
       COUT(4) << "position: (cam)" << this->camNode_->getPosition() << std::endl;
-/*
-//        node->setInheritOrientation(false);
-        cam->setPosition(Vector3(0,50,-150));
-        cam->lookAt(Vector3(0,20,0));
-        cam->roll(Degree(0));
-      *//*COUT(4) << "creating new camera" << std::endl;*/
       cam_ = new Camera(this->camNode_);
 
@@ -436 +436 @@
     void SpaceShip::tick(float dt)
     {
+        if (this->cam_)
+            this->cam_->tick(dt);
+
         if (this->redNode_ && this->greenNode_)
         {