Changeset 11563

Timestamp:

Nov 20, 2017, 1:06:08 PM (7 years ago)

Author:

pascscha

Message:

death message initiated

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• data/overlays/FlappyOrxHUD.oxo (modified) (2 diffs)
• src/modules/flappyorx/FlappyOrx.cc (modified) (2 diffs)
• src/modules/flappyorx/FlappyOrx.h (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) (4 diffs)
• src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) (3 diffs)

code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

@@ -42 +42 @@
 
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
-    <Light type=directional position="1100, 11000, -7000" lookat="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+    <Light type=directional position="11000, 11000, -7000" lookat="0, 0, 0" diffuse="1, 1, 1, 1" specular="1.0, 0.9, 0.9, 1.0" />
     <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
 

code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo

@@ -15 +15 @@
      align     = "left"
 
-     showlives     = false
      showpoints     = true
+    />
+
+    <FlappyOrxHUDinfo
+     position  = "0.02, 0.01"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showmessage     = true
     />
 
@@ -26 +36 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-     caption   = "Points: "
+     caption   = "Score: "
     />
     <!-- <FlappyOrxHUDinfo 

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

@@ -51 +51 @@
 #include "core/command/ConsoleCommand.h"
 #include "worldentities/ExplosionPart.h"
+
 
 namespace orxonox
@@ -198 +199 @@
     };
 
+    bool FlappyOrx::isDead(){
+        return true;
+    }
+
+    std::string FlappyOrx::getDeathMessage(){
+        return "hello world";
+    }
+
     void FlappyOrx::comboControll()
     {

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

@@ -88 +88 @@
             // checks if multiplier should be reset.
             void comboControll();
+
+            bool isDead();
+            std::string getDeathMessage();
+
             int lives;
             int multiplier;

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

@@ -45 +45 @@
         this->bShowPoints_ = false;
         this->bShowMultiplier_ = false;
+        this->bShowGameOver_ = false;
+        this->sGameOverMessage_ = "";
     }
 
@@ -52 +54 @@
 
         XMLPortParam(FlappyOrxHUDinfo, "showlives",     setShowLives,     getShowLives,     xmlelement, mode).defaultValues(false);
-        XMLPortParam(FlappyOrxHUDinfo, "showPoints",     setShowPoints,     getShowPoints,     xmlelement, mode).defaultValues(false);
+        XMLPortParam(FlappyOrxHUDinfo, "showpoints",    setShowPoints,    getShowPoints,    xmlelement, mode).defaultValues(false);
+        XMLPortParam(FlappyOrxHUDinfo, "showmessage",   setShowMessage,   getShowMessage,   xmlelement, mode).defaultValues(false);
        
     
@@ -71 +74 @@
             {
                 const std::string& points = multi_cast<std::string>(this->FlappyOrxGame->getPoints());
-                if (this->FlappyOrxGame->lives <= 0)
-                {
-                    setTextSize(0.2);
-                    setPosition(Vector2(0.1, 0.02));
-                    this->setCaption("Final score:\n" + points);
-                    this->setColour(ColourValue(1, 0, 0, 1));
-                }
-                else
+                if (not this->FlappyOrxGame->isDead())
                 {
                     setTextSize(0.04);
@@ -85 +81 @@
                     this->setCaption(points);
                 }
+            }
+            if(this->bShowGameOver_){
+                if(this->FlappyOrxGame->isDead()){
+                    std::string message = this->FlappyOrxGame->getDeathMessage();
+                    setTextSize(0.4);
+                    setPosition(Vector2(.5, .5));
+                    this->setCaption(message);
+                    this->setColour(ColourValue(1, 0, 0, 1));
+                }
+
             }
            

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

@@ -32 +32 @@
 #include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
+#include <cstring>
 
 namespace orxonox
@@ -64 +65 @@
                 { return this->bShowMultiplier_; }
 
+            inline void setShowMessage(bool value){
+                bShowGameOver_ = value;
+            }
+            inline bool getShowMessage() const
+                { return this->bShowGameOver_; }
+
 
         private:
@@ -71 +78 @@
             bool bShowPoints_;
             bool bShowMultiplier_;
+            bool bShowGameOver_;
+            std::string sGameOverMessage_;
     };
 }