Changeset 11402 for code/branches/SuperOrxoBros_FS17/src

Timestamp:

Apr 25, 2017, 2:51:44 PM (8 years ago)

Author:

jkindle

Message:

Added mushrooms and deadzone

Location:

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros

Files:

• CMakeLists.txt (modified) (1 diff)
• SOB.cc (modified) (2 diffs)
• SOB.h (modified) (1 diff)
• SOBFigure.cc (modified) (4 diffs)
• SOBMushroom.cc (added)
• SOBMushroom.h (added)
• SOBPrereqs.h (modified) (1 diff)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt

@@ -6 +6 @@
   SOBItem.cc
   SOBQBlock.cc
+  SOBMushroom.cc
 
 )

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

@@ -64 +64 @@
         this->center_ = nullptr;
         figure_ = nullptr;
+        setHUDTemplate("JumpHUD");
 
     }
@@ -144 +145 @@
     }
 
+void SOB::tick(float dt)
+    {
+        SUPER(SOB, tick, dt);
 
+        if (this->figure_ != nullptr && figure_->dead_)
+            orxout() << "DEED" << endl;
+       
+    }
 
 

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOB.h

@@ -52 +52 @@
             SOB(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~SOB(); //!< Destructor. Cleans up, if initialized.
+            virtual void tick(float dt) override;
 
        

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

@@ -40 +40 @@
 #include "graphics/ParticleSpawner.h"
 
+#include "SOBMushroom.h"
 
 namespace orxonox
@@ -74 +75 @@
 
         isColliding_ = true;
-
+        SOBMushroom* mush = orxonox_cast<SOBMushroom*>(otherObject);
+        if (mush != nullptr) {
+            orxout() << "YEPPIE" << endl;
+            //DESTROY THE OTHER OBJECT otherObject.destroyLater();
+        }
 
 return true;
@@ -107 +112 @@
 
 
+
         if (firePressed_ == false) {
              gravityAcceleration_ = 350.0;
@@ -116 +122 @@
           Vector3 velocity = getVelocity();
           Vector3 position = getPosition();
+
+
+          if (position.z < -100)
+            dead_ = true;
 
           if (dead_) {

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h

@@ -79 +79 @@
     class SOBItem;
     class SOBQBlock;
+    class SOBMushroom;
     /*
     class PongScore;*/