Changeset 11566 for code/branches

Timestamp:

Nov 20, 2017, 2:00:56 PM (7 years ago)

Author:

pascscha

Message:

skybox

Location:

code/branches/FlappyOrx_HS17

Files:

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

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

@@ -32 +32 @@
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBoxFlappyOrx"
+    skybox     = "Orxonox/skyBoxBasic"
   >
 

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

@@ -29 +29 @@
     />
 
-    <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"

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

@@ -67 +67 @@
         point = 0;
         bShowLevel = false;
-        sDeathMessage = "hallihallo";
+        sDeathMessage = "Welcome to FlappyOrx\nPress Space to start!";
         bIsDead = true;
         multiplier = 1;

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

@@ -68 +68 @@
             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));
@@ -79 +79 @@
             }
             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));

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

@@ -69 +69 @@
         SUPER(FlappyOrxShip, tick, dt);
         //Execute movement
-        if (this->hasLocalController()&&not isDead)
+        if (this->hasLocalController())
         {
             if(getHealth()<0){
@@ -81 +81 @@
             
 
-            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();
@@ -154 +155 @@
     void FlappyOrxShip::death()
     {
+        isDead = true;
         Vector3 pos = getPosition();
         pos.x = 0;