Changeset 11533 for code/branches/FlappyOrx_HS17/src/modules

Timestamp:

Nov 6, 2017, 2:12:57 PM (7 years ago)

Author:

merholzl

Message:

point system in place

Location:

code/branches/FlappyOrx_HS17/src/modules/flappyorx

Files:

• FlappyOrx.cc (modified) (3 diffs)
• FlappyOrx.h (modified) (1 diff)
• FlappyOrxHUDinfo.cc (modified) (5 diffs)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc

@@ -63 +63 @@
         bEndGame = false;
         lives = 1;
-        level = 1;
+        level = 0;
         point = 0;
         bShowLevel = false;
@@ -81 +81 @@
             this->tubes.pop();
             levelUp();
+            point++;
         }
     }
@@ -87 +88 @@
     {
         level++;
-        //toggleShowLevel();
+        toggleShowLevel();
         //showLevelTimer.setTimer(3.0f, false, createExecutor(createFunctor(&FlappyOrx::toggleShowLevel, this)));
     }

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

@@ -96 +96 @@
         private:
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
-
+            
             const static int nAst = 7;
             Circle Asteroids[nAst];

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc

@@ -42 +42 @@
         this->FlappyOrxGame = nullptr;
         this->bShowLives_ = false;
-        this->bShowLevel_ = false;
+        this->bShowLevel_ = true;
         this->bShowPoints_ = false;
         this->bShowMultiplier_ = false;
@@ -51 +51 @@
         SUPER(FlappyOrxHUDinfo, XMLPort, xmlelement, mode);
 
-        // XMLPortParam(FlappyOrxHUDinfo, "showlives",     setShowLives,     getShowLives,     xmlelement, mode).defaultValues(false);
-         XMLPortParam(FlappyOrxHUDinfo, "showPoints",     setShowPoints,     getShowPoints,     xmlelement, mode).defaultValues(false);
-        // XMLPortParam(FlappyOrxHUDinfo, "showLevel",     setShowLevel,     getShowLevel,     xmlelement, mode).defaultValues(false);
-        // XMLPortParam(FlappyOrxHUDinfo, "showMultiplier",     setShowMultiplier,     getShowMultiplier,     xmlelement, mode).defaultValues(false);
+        XMLPortParam(FlappyOrxHUDinfo, "showlives",     setShowLives,     getShowLives,     xmlelement, mode).defaultValues(false);
+        XMLPortParam(FlappyOrxHUDinfo, "showPoints",     setShowPoints,     getShowPoints,     xmlelement, mode).defaultValues(false);
+       
+    
     }
 
@@ -63 +63 @@
         if (this->FlappyOrxGame)
         {
-            // if (this->bShowLives_)
+            // if (this->bShowLives_)  //preperation for easy mode
             // {
-            //     const std::string& lives = multi_cast<std::string>(this->FlappyOrxGame->getLives());
+            //     const std::string& lives = multi_cast<std::string>(this->InvaderGame->getLives());
             //     this->setCaption(lives);
-            // }
-            // else if(this->bShowLevel_)
-            // {
-            //     const std::string& Level = multi_cast<std::string>(this->FlappyOrxGame->getLevel());
-            //     if (this->FlappyOrxGame->lives <= 0)
-            //     {
-            //         setPosition(Vector2(0.1, 0.65));
-            //         this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart fly out of the screen!");
-            //         setTextSize(0.05);
-            //         this->FlappyOrxGame->bEndGame = true;
-            //     }
-            //     else if (this->FlappyOrxGame->bShowLevel)
-            //     {
-            //         setTextSize(0.1);
-            //         setPosition(Vector2(0.3, 0.55));
-            //         std::stringstream sstm;
-            //         sstm << "Level " << Level;
-            //         this->setCaption(sstm.str()); // + level
-            //     }
-            //     else
-            //     {
-            //         setTextSize(0.04);
-            //         setPosition(Vector2(0.14, 0.055));
-            //         this->setCaption(Level);
-            //     }
             // }
             if(this->bShowPoints_)
@@ -99 +74 @@
                 {
                     setTextSize(0.2);
-                    setPosition(Vector2(0.1, 0.25));
+                    setPosition(Vector2(0.1, 0.02));
                     this->setCaption("Final score:\n" + points);
                     this->setColour(ColourValue(1, 0, 0, 1));
@@ -106 +81 @@
                 {
                     setTextSize(0.04);
-                    setPosition(Vector2(0.14, 0.1));
+                    setPosition(Vector2(0.14, 0.02));
                     this->setColour(ColourValue(1, 1, 1, 1));
                     this->setCaption(points);
                 }
             }
-            // else if(this->bShowMultiplier_)
-            // {
-            //     int mult = this->FlappyOrxGame->getMultiplier();
-            //     const std::string& Multiplier = "X " + multi_cast<std::string>(mult);
-            //     this->setCaption(Multiplier);
-            //     this->setColour(ColourValue(1, 0, 0, clamp(float(mult * 0.1), 0.0f, 1.0f)));
-            //     this->setTextSize(clamp(float(mult * 0.1), 0.0f, 1.0f) * 0.01f + 0.04f);
-            // }
+           
         }
     }