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

Timestamp:

Dec 4, 2017, 2:38:03 PM (8 years ago)

Author:

merholzl

Message:

More clean-up, particle fix, deleting unnecessary files, adding quotes

File:

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

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      FLeo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...
@@ -52 +53 @@
         deathTime = 0;
 
-        particleLifespan = 0.1;
+        particleLifespan = 0.08;
         particleAge = 0;
 
@@ -119 +120 @@
             if (camera != nullptr)
             {
-                //camera->setPosition(Vector3(-pos.z, -pos.y, 0));
                 camera->setPosition(pos.x,-100,0);
                 camera->setOrientation(Vector3::UNIT_Z, Degree(0));
@@ -138 +138 @@
 
     int FlappyOrxShip::timeUntilRespawn(){
-        return 2-time(0)+deathTime;
+        return 1-time(0)+deathTime;
     }
 
@@ -154 +154 @@
     }
 
-    // void FlappyOrxShip::rotateRoll(const Vector2& value)
-    // {
-    //     if (getGame())
-    //         if (getGame()->bEndGame)
-    //             getGame()->end();
-    // }
-
+  
     FlappyOrx* FlappyOrxShip::getGame()
     {
@@ -177 +171 @@
         deathTime = time(0);
 
-        orxout()<<"death time: "<<deathTime<<std::endl;
+        //orxout()<<"death time: "<<deathTime<<std::endl;
         Vector3 pos = getPosition();
         pos.x = 0;