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

Timestamp:

Dec 3, 2017, 9:22:33 PM (7 years ago)

Author:

pascscha

Message:

XML Port

File:

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

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

@@ -33 +33 @@
 
 #include "FlappyOrxShip.h"
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "FlappyOrx.h"
 #include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
+#include "graphics/ParticleSpawner.h"
 #include <math.h> 
 #include <ctime>
@@ -50 +48 @@
         RegisterObject(FlappyOrxShip);
 
-        this->UpwardThrust = 1;
-        this->speed = 1;
-        this->gravity = 1;
+        
         isDead = true;
         deathTime = 0;
+
+        particleLifespan = 0.1;
+        particleAge = 0;
+
+        particlespawner_ = NULL;
         
     }
 
     void FlappyOrxShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-        {   
-            SUPER(FlappyOrxShip, XMLPort, xmlelement, mode);
-            XMLPortParam(FlappyOrxShip, "Speed", setSpeed, getSpeed, xmlelement, mode);
-            XMLPortParam(FlappyOrxShip, "UpwardThrust", setUpwardThrust, getUpwardThrust, xmlelement, mode);
-            XMLPortParam(FlappyOrxShip, "Gravity", setGravity, getGravity, xmlelement, mode);
+    {   
+        SUPER(FlappyOrxShip, XMLPort, xmlelement, mode);
+        XMLPortParam(FlappyOrxShip,"speedBase", setSpeedBase, getSpeedBase, xmlelement,mode);
+        XMLPortParam(FlappyOrxShip,"speedIncrease", setSpeedIncrease, getSpeedIncrease, xmlelement,mode);
+        XMLPortParam(FlappyOrxShip,"tubeDistanceBase", setTubeDistanceBase, getTubeDistanceBase, xmlelement,mode);
+        XMLPortParam(FlappyOrxShip,"tubeDistanceIncrease", setTubeDistanceIncrease, getTubeDistanceIncrease, xmlelement,mode);
+
+        XMLPortParam(FlappyOrxShip,"upwardThrust", setUpwardthrust, getUpwardthrust, xmlelement,mode);
+        XMLPortParam(FlappyOrxShip,"gravity", setGravity, getGravity, xmlelement,mode);
     }
 
@@ -69 +74 @@
     {
         SUPER(FlappyOrxShip, tick, dt);
+
+
+        particleAge+=dt;
+        //the particle spawner that generates the fire from the backpack when pressed
+        if (particlespawner_ == NULL) {
+            for (WorldEntity* object : this->getAttachedObjects())
+            {
+                if (object->isA(Class(ParticleSpawner)))
+                particlespawner_ = (ParticleSpawner*) object;
+            }
+        }
+        else if(particleAge>particleLifespan){
+            particlespawner_->setLifetime(1);
+        }
+
+
         //Execute movement
         if (this->hasLocalController())
@@ -87 +108 @@
                     isFlapping = false;
                     if(pos.z > -150)
-                        velocity.y = -UpwardThrust;
+                        velocity.y = -upwardThrust;
                 }
 
@@ -122 +143 @@
     void FlappyOrxShip::boost(bool boost){
 
+        if(not isDead){
+            particleAge = 0;
+        }  
     
         if(isDead&&timeUntilRespawn()<=0){