Changeset 11761 for code/branches/Presentation_HS17_merge/src

Timestamp:

Feb 18, 2018, 12:50:22 AM (7 years ago)

Author:

landauf

Message:

[FlappyOrx_HS17] bugfix: velocity was never initialized (expecially x, which wasn't necessary anyway)

Location:

code/branches/Presentation_HS17_merge/src/modules/flappyorx

Files:

• FlappyOrxShip.cc (modified) (4 diffs)
• FlappyOrxShip.h (modified) (1 diff)

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

@@ -51 +51 @@
         isFlapping = false;
         isDead = true;
+        velocity = 0;
         speed = 0;
         upwardThrust = 0;
@@ -107 +108 @@
 
             if(not isDead){
-                velocity.y += gravity*dt;
+                velocity += gravity*dt;
                 if(isFlapping){
                     isFlapping = false;
                     if(pos.z > -150)
-                        velocity.y = -upwardThrust;
+                        velocity = -upwardThrust;
                 }
 
-                pos += Vector3(speed + velocity.x, 0, velocity.y) * dt; 
+                pos += Vector3(speed, 0, velocity) * dt;
             }
             
@@ -129 +130 @@
             
             setPosition(pos);
-            setOrientation(Vector3::UNIT_Y, Degree(270-velocity.y/10));
+            setOrientation(Vector3::UNIT_Y, Degree(270-velocity/10));
 
             if(pos.z > 150){
@@ -176 +177 @@
         pos.z = 0;
         pos.y = 0;
-        velocity.y = 0;
+        velocity = 0;
         setPosition(pos);
     }

code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h

@@ -88 +88 @@
             bool isFlapping;
             bool isDead;
+            float velocity;
             float speed, upwardThrust, gravity;
             float particleAge, particleLifespan;
             time_t deathTime;
-            struct Velocity
-            {
-                float x;
-                float y;
-            } velocity;
 
     };