Changeset 1314 for code/branches/hud3/src/orxonox/objects

Timestamp:

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

Author:

FelixSchulthess

Message:

added speedometer.

Location:

code/branches/hud3/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (2 diffs)

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

@@ -270 +270 @@
       camName_=camera;
       // change camera attributes here, if you want to ;)
-      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
-      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,0,-1));
-      //camNode_->setOrientation(q1*q2);
     }
 
@@ -298 +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);
       if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID){
         this->setBacksync(true);
@@ -448 +448 @@
     }
 
+    float SpaceShip::getMaxSpeed() { return maxSpeed_; }
+
     void SpaceShip::tick(float dt)
     {

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

@@ -64 +64 @@
 
             void getFocus();
-            static SpaceShip* instance_s;
-            static Vector3 getSPosition();
-            static Quaternion getSOrientation();
-            static std::string whereAmI();
+            static SpaceShip* instance_s;
+            static Vector3 getSPosition();
+            static Quaternion getSOrientation();
+            static std::string whereAmI();
             static void setMaxSpeedTest(float value)
                 { SpaceShip::instance_s->setMaxSpeed(value); }
@@ -77 +77 @@
             bool mouseScrolled      (const MouseState& state) { return true; }
 
+            float getMaxSpeed();
 
         private: