Changeset 8658 for code/branches

Timestamp:

May 29, 2011, 1:40:53 PM (14 years ago)

Author:

landauf

Message:

the "lift" which is applied to the spaceship when pitching is now also applied when yawing.
moving up/down or left/right is now again possible.

Location:

code/branches/presentation/src/orxonox

Files:

• items/Engine.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (4 diffs)

code/branches/presentation/src/orxonox/items/Engine.cc

@@ -158 +158 @@
         SUPER(Engine, tick, dt);
 
-        const Vector3& direction = this->getDirection();
+        Vector3 direction = this->getDirection();
+        float directionLength = direction.length();
+        if (directionLength > 1.0f)
+            direction /= directionLength; // normalize
+        
         Vector3 velocity = this->ship_->getLocalVelocity();
         Vector3 acceleration = Vector3::ZERO;

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -224 +224 @@
     {
         this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
-        this->steering_.z = -value.x;
+        this->steering_.z -= value.x;
     }
 
@@ -230 +230 @@
     {
         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
-        this->steering_.x = value.x;
+        this->steering_.x += value.x;
     }
 
@@ -236 +236 @@
     {
         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
-        this->steering_.y = value.x;
+        this->steering_.y += value.x;
     }
 
@@ -244 +244 @@
 
         Pawn::rotateYaw(value);
+
+                //This function call adds a lift to the ship when it is rotating to make it's movement more "realistic" and enhance the feeling.
+        if (abs(this-> getLocalVelocity().z) < stallSpeed_)  {this->moveRightLeft(-lift_ / 5 * value * sqrt(abs(this-> getLocalVelocity().z)));}
     }