Changeset 1287 for code/branches/camera/src/orxonox/objects/SpaceShip.cc

Timestamp:

May 15, 2008, 3:54:30 PM (16 years ago)

Author:

bknecht

Message:

camera stuff works now, but maybe need some adjustments, please test this while playing

File:

• code/branches/camera/src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)

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

@@ -79 +79 @@
 
         this->camNode_ = 0;
+        this->cam_ = NULL;
 
         this->tt_ = 0;
@@ -148 +149 @@
         if (this->tt_)
             delete this->tt_;
+        if (this->cam_)
+          delete this->cam_;
     }
 
@@ -284 +287 @@
     {
         this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
-        camNode_->setPosition(Vector3(-50,0,10));
+        camNode_->setPosition(Vector3(-30,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);
+        //this->camNode_->showBoundingBox(true);
+
 /*
 //        node->setInheritOrientation(false);
@@ -292 +300 @@
 */
         cam_ = new Camera(this->camNode_);
-        cam_->setTargetNode(this->getNode());
+        cam_->setTargetNode(this->chFarNode_);
         CameraHandler::getInstance()->requestFocus(cam_);
 //        cam->setPosition(Vector3(0,-350,0));
@@ -427 +435 @@
 
     void SpaceShip::tick(float dt)
-    {
+    {/*
+      if (this->cam_)
+        this->cam_->update();
+      */
+      if (this->cam_)
+        this->cam_->tick(dt);
+
       if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
         {