Changeset 11529 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

Timestamp:

Nov 6, 2017, 12:52:38 PM (7 years ago)

Author:

pascscha

Message:

Asteroid Clusters

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc (modified) (3 diffs)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -73 +73 @@
             }
             Vector3 pos = getPosition();
-            velocity.y += gravity;
+
+            getGame()->updatePlayerPos(pos.x);
+            
+
+            velocity.y += gravity*dt;
             if(isFlapping){
                 isFlapping = false;
-                velocity.y = -UpwardThrust;
+                if(pos.z > -150)
+                    velocity.y = -UpwardThrust;
             }
 
             pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
-            if(pos.z < -150 || pos.z > 150){
+            if(pos.z > 150){
                 pos.z=0;
                 velocity.y = 0;
@@ -94 +99 @@
                 }
             
+            
             // Camera
             Camera* camera = this->getCamera();
@@ -102 +108 @@
             }
 
+            
             setPosition(pos);
             setOrientation(Vector3::UNIT_Y, Degree(270));