[Orxonox-commit 230] r2073 - in media: levels overlay

[landauf at orxonox.net]

Author: landauf
Date: 2009-04-02 20:37:25 +0200 (Thu, 02 Apr 2009)
New Revision: 2073

Added:
   media/levels/ponghud.oxw
Modified:
   media/levels/hudtemplates3.oxw
   media/levels/presentation_pong.oxw
   media/overlay/debug.oxo
Log:
added HUD for Pong gametype

Modified: media/levels/hudtemplates3.oxw
===================================================================
--- media/levels/hudtemplates3.oxw	2009-04-02 15:41:11 UTC (rev 2072)
+++ media/levels/hudtemplates3.oxw	2009-04-02 18:37:25 UTC (rev 2073)
@@ -1,5 +1,6 @@
+<!--
 <Template name="defaultHUD">
-  <OverlayGroup name = "chatoverlay" scale = "1, 1">
+  <OverlayGroup name = "defaultHUD" scale = "1, 1">
     <ChatOverlay
      name     = "chat"
      position = "0.03, 0.5"
@@ -18,6 +19,7 @@
     />
   </OverlayGroup>
 </Template>
+-->
 
 <Template name="spectatorhud">
   <OverlayGroup name = "spectatorhud" scale = "1, 1">
@@ -25,7 +27,7 @@
 </Template>
 
 <Template name="spaceshiphud">
-  <OverlayGroup name = "HUD" scale = "1, 1">
+  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
     <HUDHealthBar
      name              = "HealthBar1"
      background        = "Orxonox/HealthBarBackground"

Added: media/levels/ponghud.oxw
===================================================================
--- media/levels/ponghud.oxw	                        (rev 0)
+++ media/levels/ponghud.oxw	2009-04-02 18:37:25 UTC (rev 2073)
@@ -0,0 +1,70 @@
+<Template name="PongHUD">
+  <OverlayGroup name="PongHUD" scale = "1, 1">
+    <PongScore
+     position  = "0.05, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showleftplayer  = true
+     showrightplayer = false
+     showname        = true
+     showscore       = false
+    />
+
+    <PongScore
+     position  = "0.49, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+
+     showleftplayer  = true
+     showrightplayer = false
+     showname        = false
+     showscore       = true
+    />
+
+    <OverlayText
+     position  = "0.505, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "center"
+
+     caption   = ":"
+    />
+
+    <PongScore
+     position  = "0.51, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showleftplayer  = false
+     showrightplayer = true
+     showname        = false
+     showscore       = true
+    />
+
+    <PongScore
+     position  = "0.95, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+
+     showleftplayer  = false
+     showrightplayer = true
+     showname        = true
+     showscore       = false
+    />
+  </OverlayGroup>
+</Template>

Modified: media/levels/presentation_pong.oxw
===================================================================
--- media/levels/presentation_pong.oxw	2009-04-02 15:41:11 UTC (rev 2072)
+++ media/levels/presentation_pong.oxw	2009-04-02 18:37:25 UTC (rev 2073)
@@ -1,7 +1,7 @@
 <?lua
   include("levels/hudtemplates3.oxw")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/ponghud.oxw")
 ?>
 
 <Template name=pongbatcameras defaults=0>
@@ -50,7 +50,7 @@
 <?lua
 for i = 1, 10, 1 
 do ?>
-    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" />
 <?lua 
 end
 ?>

Modified: media/overlay/debug.oxo
===================================================================
--- media/overlay/debug.oxo	2009-04-02 15:41:11 UTC (rev 2072)
+++ media/overlay/debug.oxo	2009-04-02 18:37:25 UTC (rev 2073)
@@ -43,7 +43,7 @@
 </OverlayGroup>
 
 <Template name="defaultHUD">
-  <OverlayGroup name = "chatoverlay" scale = "1, 1">
+  <OverlayGroup name = "defaultHUD" scale = "1, 1">
     <ChatOverlay
      name     = "chat"
      position = "0.03, 0.5"