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

Timestamp:

May 4, 2017, 3:17:59 PM (7 years ago)

Author:

jkindle

Message:

Fixed turning, added and finished Gumbas, added turnOnCollide for all NPC and items, added Flagstone - todo: add points on flagstone hit and go into a between lvl mode, then warp to lvl 2. AAH, and added onDeath fcts…

File:

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

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

@@ -41 +41 @@
 
 #include "SOBMushroom.h"
+#include "SOBGumba.h"
 #include "SOB.h"
+#include "SOBFlagstone.h"
 
 namespace orxonox
@@ -66 +68 @@
         pitch_ = 0.0;
 
+        predead_ = false;
         dead_ = false;
         gotPowerUp_ = false;
@@ -79 +82 @@
         isColliding_ = true;
         SOBMushroom* mush = orxonox_cast<SOBMushroom*>(otherObject);
-        // ADD ANOTHER OBJECT FOR BAD GUMBAS AND REMOVE POWERUP OR KILL PLAYER ON COLLISION WITHOUT Z-ACCELERATION
+        SOBGumba* gumba = orxonox_cast<SOBGumba*>(otherObject);
+        SOBFlagstone* flagstone = orxonox_cast<SOBFlagstone*>(otherObject);
+
         if (mush != nullptr && !(mush->hasCollided_)) {
             otherObject->destroyLater();
@@ -87 +92 @@
             mush->hasCollided_ = true;
 
-        }
-
-        return true;
-    }
-
-
-
-    void SOBFigure::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(SOBFigure, XMLPort, xmlelement, mode);
-
-    }
-
-
-
-    void SOBFigure::tick(float dt)
-    {
-        SUPER(SOBFigure, tick, dt);
-
-        if (particlespawner_ == NULL) {
-            for (WorldEntity* object : this->getAttachedObjects())
-            {
-               if (object->isA(Class(ParticleSpawner)))
-                particlespawner_ = object;
-
-        }
-
-    }
-
-
-
-
-
-
-    if (firePressed_ == false) {
-       gravityAcceleration_ = 350.0;
-
-   }
-
-   if (hasLocalController())
-   {
-      Vector3 velocity = getVelocity();
-      Vector3 position = getPosition();
-
-
-      if (position.z < -100)
-        dead_ = true;
-
-    if (dead_) {
-        velocity.x = 0;
-        velocity.z = 0;
-        setVelocity(velocity);
-        return;
-    }
-
-
-    int maxvelocity_x = 100;
-    int speedAddedPerTick = 5;
-    int camMaxOffset = 25;
-
-    timeSinceLastFire_ += dt;
-    lastSpeed_z = velocity.z;
+        } else if (gumba != nullptr && !(gumba->hasCollided_)) {
+
+            if (getVelocity().z >= -20) {
+              Vector3 vel = getVelocity();
+              vel.y = -80;
+              vel.z = 200;
+              setVelocity(vel);
+              predead_=true; 
+          } else {
+            gumba->destroyLater();
+            gumba->hasCollided_ = true;
+            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+            SOBGame->addGumba();
+
+
+        }
+    }
+
+     if (flagstone != nullptr && !(flagstone->hasCollided_)) {
+            flagstone->hasCollided_ = true;
+
+     }
+
+    return true;
+}
+
+
+
+void SOBFigure::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+{
+    SUPER(SOBFigure, XMLPort, xmlelement, mode);
+
+}
+
+
+int SOBFigure::sgn(float x) {
+
+    if (x < 0.0) return -1;
+    return 1;
+}
+
+void SOBFigure::tick(float dt)
+{
+    SUPER(SOBFigure, tick, dt);
+
+    if (particlespawner_ == NULL) {
+        for (WorldEntity* object : this->getAttachedObjects())
+        {
+         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;
 
 
 
         //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 (firePressed_ && isColliding_ && std::abs(velocity.z) < 0.1 && std::abs(lastSpeed_z) < 0.1) {
+    gravityAcceleration_ = 100.0;
             velocity.z = 110; //150
         }
@@ -169 +206 @@
         //Left-right movement with acceleration
         float rot = getOrientation().getRoll().valueDegrees();
+        orxout() << rot << endl;
         if (moveRightPressed_) {
-            if (rot < 0.0)
-                setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+            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) {
                 velocity.x += speedAddedPerTick;
 
-                
-
-                
-
-                // if (pitch_ > 0.0) {
-                //     pitch -= turn_fac*dt);
-                // }
             }
         } else if (moveLeftPressed_) {
-            if (rot >= 0.0)
-                setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+            if (!(abs(rot) > 175.0 ))
+                setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + sgn(rot)*dt*Radian(6));
+
+
 
             if (std::abs(velocity.x) < maxvelocity_x) {