[Orxonox-commit 6942] r11563 - in code/branches/FlappyOrx_HS17: data/levels data/overlays src/modules/flappyorx
pascscha at orxonox.net
pascscha at orxonox.net
Mon Nov 20 13:06:09 CET 2017
Author: pascscha
Date: 2017-11-20 13:06:08 +0100 (Mon, 20 Nov 2017)
New Revision: 11563
Modified:
code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h
Log:
death message initiated
Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw 2017-11-20 12:06:08 UTC (rev 11563)
@@ -41,7 +41,7 @@
/>
<!-- <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 />
Modified: code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
===================================================================
--- code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo 2017-11-20 12:06:08 UTC (rev 11563)
@@ -14,10 +14,20 @@
colour = "1.0, 1.0, 1.0, 1.0"
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
+ />
+
<OverlayText
position = "0.02, 0.02"
pickpoint = "0.0, 0.0"
@@ -25,7 +35,7 @@
textsize = 0.04
colour = "1.0, 1.0, 1.0, 1.0"
align = "left"
- caption = "Points: "
+ caption = "Score: "
/>
<!-- <FlappyOrxHUDinfo
position = "0.14, 0.01"
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-20 12:06:08 UTC (rev 11563)
@@ -51,6 +51,7 @@
#include "core/command/ConsoleCommand.h"
#include "worldentities/ExplosionPart.h"
+
namespace orxonox
{
RegisterUnloadableClass(FlappyOrx);
@@ -197,6 +198,14 @@
};
+ bool FlappyOrx::isDead(){
+ return true;
+ }
+
+ std::string FlappyOrx::getDeathMessage(){
+ return "hello world";
+ }
+
void FlappyOrx::comboControll()
{
if (b_combo)
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-20 12:06:08 UTC (rev 11563)
@@ -87,6 +87,10 @@
void addPoints(int numPoints);
// checks if multiplier should be reset.
void comboControll();
+
+ bool isDead();
+ std::string getDeathMessage();
+
int lives;
int multiplier;
bool bEndGame;
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc 2017-11-20 12:06:08 UTC (rev 11563)
@@ -44,6 +44,8 @@
this->bShowLevel_ = true;
this->bShowPoints_ = false;
this->bShowMultiplier_ = false;
+ this->bShowGameOver_ = false;
+ this->sGameOverMessage_ = "";
}
void FlappyOrxHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -51,7 +53,8 @@
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, "showpoints", setShowPoints, getShowPoints, xmlelement, mode).defaultValues(false);
+ XMLPortParam(FlappyOrxHUDinfo, "showmessage", setShowMessage, getShowMessage, xmlelement, mode).defaultValues(false);
}
@@ -70,15 +73,8 @@
if(this->bShowPoints_)
{
const std::string& points = multi_cast<std::string>(this->FlappyOrxGame->getPoints());
- if (this->FlappyOrxGame->lives <= 0)
+ if (not this->FlappyOrxGame->isDead())
{
- setTextSize(0.2);
- setPosition(Vector2(0.1, 0.02));
- this->setCaption("Final score:\n" + points);
- this->setColour(ColourValue(1, 0, 0, 1));
- }
- else
- {
setTextSize(0.04);
setPosition(Vector2(0.14, 0.02));
this->setColour(ColourValue(1, 1, 1, 1));
@@ -85,6 +81,16 @@
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));
+ }
+
+ }
}
}
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h 2017-11-13 16:25:09 UTC (rev 11562)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h 2017-11-20 12:06:08 UTC (rev 11563)
@@ -31,6 +31,7 @@
#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
+#include <cstring>
namespace orxonox
{
@@ -63,7 +64,13 @@
inline bool getShowMultiplier() const
{ return this->bShowMultiplier_; }
+ inline void setShowMessage(bool value){
+ bShowGameOver_ = value;
+ }
+ inline bool getShowMessage() const
+ { return this->bShowGameOver_; }
+
private:
FlappyOrx* FlappyOrxGame;
bool bShowLives_;
@@ -70,6 +77,8 @@
bool bShowLevel_;
bool bShowPoints_;
bool bShowMultiplier_;
+ bool bShowGameOver_;
+ std::string sGameOverMessage_;
};
}
#endif /* _FlappyOrxHUDinfo_H__ */
More information about the Orxonox-commit
mailing list