Changeset 12031 for code/branches/mergeFS18/src

Timestamp:

Oct 10, 2018, 4:08:48 PM (6 years ago)

Author:

merholzl

Message:

merged Tubes into SuperOrxoBros

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/modules/superorxobros/CMakeLists.txt (modified) (2 diffs)
• src/modules/superorxobros/SOB.cc (modified) (1 diff)
• src/modules/superorxobros/SOBFigure.cc (modified) (12 diffs)
• src/modules/superorxobros/SOBFigure.h (modified) (3 diffs)
• src/modules/superorxobros/SOBGumba.cc (modified) (1 diff)
• src/modules/superorxobros/SOBItem.h (modified) (1 diff)
• src/modules/superorxobros/SOBPrereqs.h (modified) (1 diff)
• src/modules/superorxobros/SOBTube.cc (copied) (copied from code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBTube.cc)
• src/modules/superorxobros/SOBTube.h (copied) (copied from code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBTube.h)

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

@@ -3 +3 @@
   SOBCenterpoint.cc
   SOB.cc
+  SOBTube.cc
   SOBFigure.cc
   SOBItem.cc
@@ -14 +15 @@
   SOBCoin.cc
   SOBGumbaBoss.cc
+  
 
 )

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

@@ -149 +149 @@
         //If player has reached end of level
         if (this->figure_ != nullptr && figure_->lvlEnded_) {
-            std::stringstream a;
+            std::stringstream a;setLvl(2);
             if(!newHighscore){
                 a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";

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

@@ -43 +43 @@
 #include <OgreMath.h>
 
+#include "SOBTube.h"
 #include "SOBMushroom.h"
 #include "SOBGumba.h"
@@ -50 +51 @@
 #include "SOBFlagstone.h"
 #include "SOBCastlestone.h"
-#include "SOBFireball.h"
 #include "Highscore.h"
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
@@ -72 +72 @@
         firePressed_        = false;
         collDisZ_           = 0;
-
+        tube                = NULL;
+
+        //Variables for Action in Tube
+        tcol_               = false;
+        tubing              = false; 
+        kkk                 = 0;
+       
         //Times and turning
         timeSinceLastFire_  = 0.0;
@@ -89 +95 @@
         reachedLvlEndState_ = 0;
 
+        positiontube_=10000;
         // Properties concerning PowerUps and items
+        
         PowerUpCounter_     = 0;
         maxPowerUp_         = 2;
@@ -112 +120 @@
 
         //Orxocast returns object with casted type if otherObject has that class, and if not a nullptr
+        //SOBTube* test;
+       
         SOBMushroom*    mush        = orxonox_cast<SOBMushroom*>    (otherObject);
+        tube                        = orxonox_cast<SOBTube*>        (otherObject);
         SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
         SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>   (otherObject);
@@ -121 +132 @@
 
 
+
         //Check if otherObject is a powerup-mushroom
         if (mush != nullptr && !(mush->hasCollided_)) {
@@ -133 +145 @@
             
             
-        }
-
-        
-
-        //Check if otherObject is a Gumba (that walking enemies)
-
-         else if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
+        }else if(tube != nullptr && !(tube->hasCollided_)){ //Check if other Object is a tube and set position wher tube is in positiontube_
+            tube->hasCollided_=true;positiontube_=getPosition().x;tcol_=true; //tcol_ used for movedown function in SOBfigure.cc
+                
+
+
+        }else if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
+            //Check if otherObject is a Gumba (that walking enemies)
 
             //If player jumps on its head, kill the Gumba, else, kill the player
@@ -209 +221 @@
     return 1;
 }
-
+/*bool SOBFigure::tubeAction(){
+return true;
+}*/
 //Function to spawn the Fireball
 void SOBFigure::spawnFireball() {
@@ -240 +254 @@
 {
     SUPER(SOBFigure, tick, dt);
-
+    
 
     bool inputAllowed = true;
-    //SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+   
 
     //the particle spawner that generates the fire from the backpack when pressed
@@ -291 +305 @@
             velocity.y = 0;
         //If player falls in a hole
-        if (position.z < -100) {
+        if (position.z < -180) {
             dead_ = true;
             SOBGame->setDone(true);
@@ -355 +369 @@
 
         //If moveUp pressed, fire a fireball
-        if(moveUpPressed_ && (PowerUpCounter_ >= FireballPower) && fireallowed_)
+        if(moveUpPressed_ && inputAllowed) //if pressed up jump through tube if you are underground
         {
+            Vector3 position1 = getPosition();
+
+              
+                
+                
+                if(position1.z>=-100 && position1.z<=-40){
+                    position1.z=40;
+                    if(460<=position1.x && position1.x<480){setPosition(position1);}  //little hack works without this but first tube must be touched     //position where second tube is
+                    if(positiontube_-10<=position1.x && position1.x<positiontube_+10){      //function for jumping through any SOBtube`s
+                    setPosition(position1);}}
+
+
+            if((PowerUpCounter_ >= FireballPower) && fireallowed_){
             spawnFireball();
+
             fireallowed_  = false;
-            firecooldown_ = 0;
+            firecooldown_ = 0;}
+        }
+        
+         if(moveDownPressed_ && inputAllowed ){ //if movedownpressed change collisiontype of tube and slip through tube
+                
+              
+                Vector3 position1 = getPosition();
+              
+
+               
+            
+               if(tube != nullptr && !(tube->movedown)){ //Check if other Object is a tube
+               
+                if(positiontube_-10<position1.x && position1.x<positiontube_+10){
+                tube->movedown=true;}
+                }
+   
         }
 
@@ -419 +463 @@
     moveLeftPressed_    = false;
     moveRightPressed_   = false;
+    
 
     isColliding_ = false;

code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h

@@ -32 +32 @@
 #include "superorxobros/SOBPrereqs.h"
 #include "worldentities/ControllableEntity.h"
+#include "SOBTube.h"
 
 
@@ -58 +59 @@
             //Soooo many declarations
             bool fireallowed_;
-
-            bool moveUpPressed_;
+            SOBTube*       tube; //class SOBTube* used because tube needs to be global using in collides against function and tick function in SOBfigure.cc
+            bool moveUpPressed_; 
+            int kkk;
+           
+            bool tcol_;  //used for getting through tube
+            bool tubing; //used for getting through tube 
             bool moveDownPressed_;
             bool moveLeftPressed_;
@@ -68 +73 @@
             float lastSpeed_z;
             float firecooldown_;
+            float positiontube_;
             bool isColliding_;
             WorldEntity* particlespawner_;

code/branches/mergeFS18/src/modules/superorxobros/SOBGumba.cc

@@ -106 +106 @@
     {
         SUPER(SOBGumba, tick, dt);
-
+       
         if (!changeAllowed_) {
             changedOn_+= dt;

code/branches/mergeFS18/src/modules/superorxobros/SOBItem.h

@@ -49 +49 @@
             virtual void setFigure(SOBFigure* newFigure);
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-
           
             bool attachedToFigure_;

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

@@ -80 +80 @@
     class SOBCastlestone;
     class SOBCoin;
+    class SOBTube;
 
 }