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

Timestamp:

Apr 27, 2017, 3:08:16 PM (7 years ago)

Author:

jkindle

Message:

Added a HUD and type to QBlocks

File:

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

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

@@ -41 +41 @@
 
 #include "SOBMushroom.h"
+#include "SOB.h"
 
 namespace orxonox
@@ -66 +67 @@
 
         dead_ = false;
+        gotPowerUp_ = false;
+        
         setAngularFactor(0.0);
-         this->enableCollisionCallback();
+        this->enableCollisionCallback();
     }
 
@@ -76 +79 @@
         isColliding_ = true;
         SOBMushroom* mush = orxonox_cast<SOBMushroom*>(otherObject);
-        if (mush != nullptr) {
-            orxout() << "YEPPIE" << endl;
-            //DESTROY THE OTHER OBJECT otherObject.destroyLater();
-        }
-
-return true;
+        // ADD ANOTHER OBJECT FOR BAD GUMBAS AND REMOVE POWERUP OR KILL PLAYER ON COLLISION WITHOUT Z-ACCELERATION
+        if (mush != nullptr && !(mush->hasCollided_)) {
+            otherObject->destroyLater();
+            gotPowerUp_ = true;
+            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+            SOBGame->addMushroom();
+            mush->hasCollided_ = true;
+
+        }
+
+        return true;
     }
 
@@ -101 +109 @@
             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;
+               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;
 
 
 
         //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
         }
@@ -163 +171 @@
         if (moveRightPressed_) {
             if (rot < 0.0)
-                    setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+                setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
 
             if (std::abs(velocity.x) < maxvelocity_x) {
@@ -178 +186 @@
         } else if (moveLeftPressed_) {
             if (rot >= 0.0)
-                    setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+                setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
 
             if (std::abs(velocity.x) < maxvelocity_x) {
@@ -200 +208 @@
             cam->setPosition(campos);
         }
-           if (campos.x - camMaxOffset > position.x) {
+        if (campos.x - camMaxOffset > position.x) {
             campos.x = position.x + camMaxOffset;
             cam->setPosition(campos);