[Orxonox-commit 7473] r12079 - in code/branches/OrxoKart_HS18: data/levels data/levels/templates data/overlays src/modules/orxokart

[ottka at orxonox.net]

Author: ottka
Date: 2018-11-07 10:38:34 +0100 (Wed, 07 Nov 2018)
New Revision: 12079

Added:
   code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo
Modified:
   code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw
   code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
Log:
fixed HUD

Modified: code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw	2018-11-07 09:28:08 UTC (rev 12078)
+++ code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw	2018-11-07 09:38:34 UTC (rev 12079)
@@ -14,7 +14,7 @@
 <?lua
   --include("templates/spaceshipPirate.oxt")
   include("templates/OrxoKartKart.oxt")
-  include("overlays/HoverHUD.oxo")
+  include("overlays/OrxoKartHUD.oxo")
 ?>
 
 <?lua

Modified: code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-11-07 09:28:08 UTC (rev 12078)
+++ code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-11-07 09:38:34 UTC (rev 12079)
@@ -1,7 +1,7 @@
 
 <Template name=OrxoKartKart>
   <SpaceShip
-   hudtemplate            = spaceshiphoverhud
+   hudtemplate            = spaceshiporxokarthud
    camerapositiontemplate = spaceshiphovercameras
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3

Added: code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo
===================================================================
--- code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo	                        (rev 0)
+++ code/branches/OrxoKart_HS18/data/overlays/OrxoKartHUD.oxo	2018-11-07 09:38:34 UTC (rev 12079)
@@ -0,0 +1,40 @@
+<Template name="OrxoKartHUD">
+  <OverlayGroup name="OrxoKartHUD" scale = "1, 1">
+  </OverlayGroup>
+</Template>
+
+
+<Template name="spaceshiporxokarthud">
+  <OverlayGroup name = "spaceshiporxokarthud" scale = "1, 1">
+    <TimeHUD
+     name       = "TimerHUD"
+     position  = "0.95, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+    />
+
+    <HUDHealthBar
+     name              = "HealthBar1"
+     background        = "Orxonox/HealthBarBackground"
+     size              = "0.35, 0.0875"
+     position          = "0.0 , 0.97"
+     pickpoint         = "0, 1"
+     bartexture        = "healthbar_bar.png"
+     textfont          = "VeraMono"
+     textusebarcolour  = true
+     textscale          = 0.4
+     textoffset        = "0.325, -0.825"
+     textpickpoint     = "0, 0"
+     textalign         = "right"
+     correctaspect     = true
+     iconmaterial      = "Orxonox/BarIconHealth"
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </HUDHealthBar>
+ </OverlayGroup>
+</Template>

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-11-07 09:28:08 UTC (rev 12078)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-11-07 09:38:34 UTC (rev 12079)
@@ -49,7 +49,7 @@
         // this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
-        this->setHUDTemplate("HoverHUD");
+        this->setHUDTemplate("OrxoKartHUD");
     }
 
     void OrxoKart::tick(float dt)