Changeset 1407 for code/trunk/src/orxonox/objects/SpaceShip.cc

Timestamp:

May 24, 2008, 1:49:54 PM (16 years ago)

Author:

rgrieder

Message:

• reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

File:

• code/trunk/src/orxonox/objects/SpaceShip.cc (modified) (6 diffs)

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -69 +69 @@
       return NULL;
     }
-
+    
     SpaceShip::SpaceShip() :
       //testvector_(0,0,0),
@@ -112 +112 @@
         this->setConfigValues();
 
-        initialDir_ = Vector3(1.0, 0.0, 0.0);
-        currentDir_ = initialDir_;
-        initialOrth_ = Vector3(0.0, 0.0, 1.0);
-        currentOrth_ = initialOrth_;
 
         this->setRotationAxis(1, 0, 0);
@@ -241 +237 @@
         CameraHandler::getInstance()->requestFocus(cam_);
 
-    }
-
-    Camera* SpaceShip::getCamera(){
-        return cam_;
     }
 
@@ -399 +391 @@
     }
 
-    Vector3 SpaceShip::getDir() {
-        return currentDir_;
-    }
-
-    Vector3 SpaceShip::getOrth(){
-        return currentOrth_;
+    Vector3 SpaceShip::getSPosition() {
+        return SpaceShip::getLocalShip()->getPosition();
+    }
+
+    Quaternion SpaceShip::getSOrientation() {
+        return SpaceShip::getLocalShip()->getOrientation();
     }
 
@@ -411 +403 @@
     void SpaceShip::tick(float dt)
     {
-        currentDir_ = getOrientation()*initialDir_;
-                currentOrth_ = getOrientation()*initialOrth_;
-
         if (this->cam_)
             this->cam_->tick(dt);
@@ -433 +422 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-
+          
             Projectile *p = new Projectile(this);
-
+            
             p->setBacksync(true);
             this->timeToReload_ = this->reloadTime_;