Changeset 11416 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

Timestamp:

May 11, 2017, 3:18:27 PM (8 years ago)

Author:

jkindle

Message:

Added the animation for the level end (walk into castle), Coins for the blocks, Castleblocks and Flagblocks

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) (12 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabien Vultier
+ *      Julien Kindle
  *   Co-authors:
- *      ...
+ *      
  *
  */
@@ -44 +44 @@
 #include "SOB.h"
 #include "SOBFlagstone.h"
+#include "SOBCastlestone.h"
 
 namespace orxonox
@@ -54 +55 @@
 
         // initialize variables
-
+        gravityAcceleration_ = 350.0;
+
+        //Vars for movement of player
         moveUpPressed_ = false;
         moveDownPressed_ = false;
@@ -60 +63 @@
         moveDownPressed_ = false;
         firePressed_ = false;
+        
+        //Times and turning
         timeSinceLastFire_ = 0.0;
         lastSpeed_z = 0.0;
+        pitch_ = 0.0;
+        timeCounter_ = 0;
+
+        //Properties of player
+        gotPowerUp_ = false;
         isColliding_ = true;
         particlespawner_ = NULL;
 
-        gravityAcceleration_ = 350.0;
-        pitch_ = 0.0;
-
+        //Properties of players life
         predead_ = false;
         dead_ = false;
-        gotPowerUp_ = false;
+        lvlEnded_ = false;
+        reachedLvlEndState_ = 0;
+
         
-        setAngularFactor(0.0);
-        this->enableCollisionCallback();
+        setAngularFactor(0.0); //Means player doesn't turn on collision, so he doesn't fall over while walking over the ground
+        this->enableCollisionCallback(); // Turns on that on every collision function collidesAgainst is executed
     }
 
@@ -81 +91 @@
 
         isColliding_ = true;
+
+        //Orxocast returns object with casted type if otherObject has that class, and if not a nullptr
         SOBMushroom* mush = orxonox_cast<SOBMushroom*>(otherObject);
         SOBGumba* gumba = orxonox_cast<SOBGumba*>(otherObject);
         SOBFlagstone* flagstone = orxonox_cast<SOBFlagstone*>(otherObject);
-
+        SOBCastlestone* castlestone = orxonox_cast<SOBCastlestone*>(otherObject);
+
+        //Check if otherObject is a powerup
         if (mush != nullptr && !(mush->hasCollided_)) {
             otherObject->destroyLater();
             gotPowerUp_ = true;
-            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
-            SOBGame->addMushroom();
-            mush->hasCollided_ = true;
-
+            SOB* SOBGame = orxonox_cast<SOB*>(getGametype()); //Get the Gametype
+            SOBGame->addMushroom(); // Tell the gametype to increase points
+            mush->hasCollided_ = true; // needed because of destroyLater takes some time and player should receive points only once
+
+        //Check if otherObject is a Gumba (that walking enemies)
         } else if (gumba != nullptr && !(gumba->hasCollided_)) {
 
+            //If player jumps on its head, kill it, else, kill the player
             if (getVelocity().z >= -20) {
               Vector3 vel = getVelocity();
@@ -100 +116 @@
               setVelocity(vel);
               predead_=true; 
+
           } else {
             gumba->destroyLater();
@@ -110 +127 @@
     }
 
-     if (flagstone != nullptr && !(flagstone->hasCollided_)) {
-            flagstone->hasCollided_ = true;
-
-     }
+    //Purpose is that if player hits the flag, he should walk into the castle at the end of the level. For that we use SOBCastlestone
+    if (reachedLvlEndState_ == 0 && flagstone != nullptr && !(flagstone->hasCollided_)) {
+        flagstone->hasCollided_ = true;
+        reachedLvlEndState_ = 1;
+        SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+        SOBGame->addPoints(flagstone->getPoints());
+
+    }
+    if (castlestone != nullptr && !(castlestone->hasCollided_)) {
+        castlestone->hasCollided_ = true;
+        reachedLvlEndState_++;
+
+    }
 
     return true;
@@ -119 +145 @@
 
 
-
-void SOBFigure::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-{
-    SUPER(SOBFigure, XMLPort, xmlelement, mode);
-
-}
-
-
+//Self implemented sign function that returns either 1 or -1 (and never 0)
 int SOBFigure::sgn(float x) {
-
     if (x < 0.0) return -1;
     return 1;
 }
 
+//For those of you who don't have an idea: the tick function is called about 50 times/sec
 void SOBFigure::tick(float dt)
 {
     SUPER(SOBFigure, tick, dt);
 
+
+    bool inputAllowed = true;
+
+    //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)))
+           if (object->isA(Class(ParticleSpawner)))
             particlespawner_ = object;
-
-    }
-
-}
-
-
-
-
-
-
-if (firePressed_ == false) {
- gravityAcceleration_ = 350.0;
-
-}
-
-if (hasLocalController())
-{
-  Vector3 velocity = getVelocity();
-  Vector3 position = getPosition();
-
-  if (!predead_)
-    velocity.y = 0;
-if (position.z < -100) {
-    dead_ = true;
-
-}
-
-if (dead_) {
-    velocity.x = 0;
-    velocity.z = 0;
-    setVelocity(velocity);
-    SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
-    if (firePressed_)
-        SOBGame->restart();
-    return;
-}
-
-
-int maxvelocity_x = 100;
-int speedAddedPerTick = 5;
-int camMaxOffset = 25;
-
-timeSinceLastFire_ += dt;
-lastSpeed_z = velocity.z;
+        }
+    }
+
+
+    //Behavior on level end - this is like described above for the movement from the player when hit the flag. He moves then into the castle
+    if (reachedLvlEndState_ != 0) {
+        timeCounter_+= dt;
+        inputAllowed = false;
+    }
+    if (reachedLvlEndState_ == 1 && timeCounter_ >= 1.5) {
+        timeCounter_ = 0;
+        reachedLvlEndState_ = 2;
+    }
+
+
+    //if input blocked, then cancel every movement operation
+    if (!inputAllowed) {
+        moveUpPressed_ = false;
+        moveDownPressed_ = false;
+        moveLeftPressed_ = false;
+        moveRightPressed_ = false;
+    }
+
+    //set the gravityto standard 350
+    if (firePressed_ == false) {
+        gravityAcceleration_ = 350.0;
+
+    }
+
+    if (hasLocalController())
+    {
+        Vector3 velocity = getVelocity();
+        Vector3 position = getPosition();
+
+        if (!predead_)
+            velocity.y = 0;
+        if (position.z < -100) {
+            dead_ = true;
+        }
+
+
+        if (dead_) {
+            velocity.x = 0;
+            velocity.z = 0;
+            setVelocity(velocity);
+            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+            if (firePressed_)
+                SOBGame->restart();
+            return;
+        }
+
+
+        int maxvelocity_x = 100;
+        int speedAddedPerTick = 5;
+        int camMaxOffset = 25;
+
+        timeSinceLastFire_ += dt;
+        lastSpeed_z = velocity.z;
 
 
 
         //Handle the rocket fire from the jetpack
-if (velocity.z > 40)
-    particlespawner_->setVisible(true); 
-else
-    particlespawner_->setVisible(false); 
+        if (velocity.z > 40)
+            particlespawner_->setVisible(true); 
+        else
+            particlespawner_->setVisible(false); 
+
 
         //If player hits space and does not move in z-dir
-if (firePressed_ && isColliding_ && std::abs(velocity.z) < 0.1 && std::abs(lastSpeed_z) < 0.1) {
-    gravityAcceleration_ = 100.0;
+        if (inputAllowed && firePressed_ && isColliding_ && std::abs(velocity.z) < 0.1 && std::abs(lastSpeed_z) < 0.1) {
+            gravityAcceleration_ = 100.0;
             velocity.z = 110; //150
         }
-
-      // rotate(1,getOrientation()* WorldEntity::FRONT)
 
 
         //Left-right movement with acceleration
         float rot = getOrientation().getRoll().valueDegrees();
-        orxout() << rot << endl;
         if (moveRightPressed_) {
             if (!(rot < 5.0 && -5.0 < rot))
                 setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() - sgn(rot)*dt*Radian(6));
-
 
             if (std::abs(velocity.x) < maxvelocity_x) {
@@ -230 +264 @@
 
 
+        //Again another EndOfLevel behavior
+        if (reachedLvlEndState_ == 1)
+            velocity.x = -2;
+        if (reachedLvlEndState_ == 2)
+            velocity.x = 30;
+        if (reachedLvlEndState_ == 3) {
+            velocity.x = 0;
+            velocity.y = 20;
+        }
+        if (reachedLvlEndState_ == 4) {
+            lvlEnded_ = true;
+            dead_ = true;
+        }
+
+        //velocity = acc. * time
         velocity.z -= gravityAcceleration_*dt;
         setVelocity(velocity);
 
 
-        //Camera operation
+        //Camera operation - the camera should always follow the player in a specific region
         Camera* cam = getCamera();
         Vector3 campos = cam->getPosition();
@@ -252 +301 @@
     }
 
-        // Move through the left and right screen boundaries
-
-        //setPosition(position);
-
-        // Reset key variables
+
+
+    // Reset key variables
     moveUpPressed_ = false;
     moveDownPressed_ = false;
     moveLeftPressed_ = false;
     moveRightPressed_ = false;
-    moveDownPressed_ = false;
+
     isColliding_ = false;
 
@@ -270 +317 @@
 
 
-
+//The following functions read the input of the player and then set the bools for the movement
 void SOBFigure::moveFrontBack(const Vector2& value)
 {
@@ -299 +346 @@
 }
 
-
-
-
-
 void SOBFigure::boost(bool boost)
 {
     firePressed_ = boost;
 }
-}
+
+
+}