[Orxonox-commit 6945] r11566 - in code/branches/FlappyOrx_HS17: data/levels data/overlays src/modules/flappyorx

[pascscha at orxonox.net]

Author: pascscha
Date: 2017-11-20 14:00:56 +0100 (Mon, 20 Nov 2017)
New Revision: 11566

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/FlappyOrxHUDinfo.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
Log:
skybox

Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-20 12:35:53 UTC (rev 11565)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-20 13:00:56 UTC (rev 11566)
@@ -31,7 +31,7 @@
     skybox       = "Orxonox/Starbox" -->
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBoxFlappyOrx"
+    skybox     = "Orxonox/skyBoxBasic"
   >
 
   <WorldAmbientSound

Modified: code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
===================================================================
--- code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo	2017-11-20 12:35:53 UTC (rev 11565)
+++ code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo	2017-11-20 13:00:56 UTC (rev 11566)
@@ -28,15 +28,6 @@
      showmessage     = true
     />
 
-    <OverlayText
-     position  = "0.02, 0.02"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "Score: "
-    />
     <!-- <FlappyOrxHUDinfo 
      position  = "0.14, 0.01"
      pickpoint = "0.0, 0.0"

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-20 12:35:53 UTC (rev 11565)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-20 13:00:56 UTC (rev 11566)
@@ -66,7 +66,7 @@
         level = 0;
         point = 0;
         bShowLevel = false;
-        sDeathMessage = "hallihallo";
+        sDeathMessage = "Welcome to FlappyOrx\nPress Space to start!";
         bIsDead = true;
         multiplier = 1;
         b_combo = false;

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-11-20 12:35:53 UTC (rev 11565)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-11-20 13:00:56 UTC (rev 11566)
@@ -67,7 +67,7 @@
         {
             if(not this->FlappyOrxGame->isDead()){
                 if(this->bShowPoints_){
-                    const std::string& points = multi_cast<std::string>(this->FlappyOrxGame->getPoints());
+                    const std::string& points = "Score: "+multi_cast<std::string>(this->FlappyOrxGame->getPoints());
                     setTextSize(0.04);
                     setPosition(Vector2(0.14, 0.02));
                     this->setColour(ColourValue(1, 1, 1, 1));
@@ -78,10 +78,16 @@
                 }
             }
             else{
-                if(this->bShowGameOver_){
+                if(this->bShowPoints_){
+                    setTextSize(0);
+                }
+                else if(this->bShowGameOver_){
                     std::string message = this->FlappyOrxGame->getDeathMessage();
                     setTextSize(0.1);
                     setPosition(Vector2(.5, .5));
+
+                    setAlignment(OverlayText::Alignment::Center);
+                    
                     this->setCaption(message);
                     this->setColour(ColourValue(1, 0, 0, 1));
                 }

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-11-20 12:35:53 UTC (rev 11565)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-11-20 13:00:56 UTC (rev 11566)
@@ -68,7 +68,7 @@
     {
         SUPER(FlappyOrxShip, tick, dt);
         //Execute movement
-        if (this->hasLocalController()&&not isDead)
+        if (this->hasLocalController())
         {
             if(getHealth()<0){
                 setHealth(1);
@@ -80,17 +80,18 @@
             getGame()->updatePlayerPos(pos.x);
             
 
-            velocity.y += gravity*dt;
-            if(isFlapping){
-                isFlapping = false;
-                if(pos.z > -150)
-                    velocity.y = -UpwardThrust;
+            if(not isDead){
+                velocity.y += gravity*dt;
+                if(isFlapping){
+                    isFlapping = false;
+                    if(pos.z > -150)
+                        velocity.y = -UpwardThrust;
+                }
+
+                pos += Vector3(speed + velocity.x, 0, velocity.y) * dt; 
             }
-
-            pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
-
-            
+                        
             // Camera
             Camera* camera = this->getCamera();
             if (camera != nullptr)
@@ -153,6 +154,7 @@
 
     void FlappyOrxShip::death()
     {
+        isDead = true;
         Vector3 pos = getPosition();
         pos.x = 0;
         pos.z = 0;