Changeset 1315

Timestamp:

May 17, 2008, 3:53:27 PM (16 years ago)

Author:

FelixSchulthess

Message:

svn save

Location:

code/branches/hud3/src/orxonox

Files:

• hud/HUD.cc (modified) (1 diff)
• objects/SpaceShip.cc (modified) (2 diffs)

code/branches/hud3/src/orxonox/hud/HUD.cc

@@ -157 +157 @@
       float vmax = SpaceShip::instance_s->getMaxSpeed();
       speedo->reset(100*v/vmax);
-      COUT(3) << 100*v/vmax << std::endl;
       radar->update();
     /*if (this->ogreNode_)

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

@@ -283 +283 @@
       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(/*this->getNode()->getPosition() +*/ Vector3(-40,0,0));
       COUT(4) << "position: (cam)" << this->camNode_->getPosition() << std::endl;
 /*
@@ -295 +295 @@
       cam_->setTargetNode(this->getNode());
 //        cam->setPosition(Vector3(0,-350,0));
-      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
-      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,0,-1));
-      //camNode_->setOrientation(q1*q2);
+      //Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
+      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(1,0,0));
+      //camNode_->setOrientation(q2);
       if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID){
         this->setBacksync(true);