[Orxonox-commit 4502] r9173 - in code/branches/newlevel2012: data/levels data/overlays src/modules/towerdefense

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-05-11 15:35:56 +0200 (Fri, 11 May 2012)
New Revision: 9173

Modified:
   code/branches/newlevel2012/data/levels/towerDefense.oxw
   code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo
   code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt
Log:
* Fixed compile error
+ Added another OverlayText, but still not seeing anything

Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-05-11 12:53:41 UTC (rev 9172)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-05-11 13:35:56 UTC (rev 9173)
@@ -12,7 +12,7 @@
 <?lua
   include("stats.oxo")
   include("HUDTemplates3.oxo")
-  include("towedefenseHUD.oxo")
+  include("towerdefenseHUD.oxo")
   include("templates/lodInformation.oxt")
 ?>
 

Modified: code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo
===================================================================
--- code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo	2012-05-11 12:53:41 UTC (rev 9172)
+++ code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo	2012-05-11 13:35:56 UTC (rev 9173)
@@ -1,14 +1,27 @@
 <Template name="TowerDefenseHUD">
   <OverlayGroup name="TowerDefenseHUD" scale = "1, 1">
-    <TowerDefensePlayerStats
+    <OverlayText
      position  = "0.05, 0.05"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
-     textsize  = 0.06
+     textsize  = 0.05
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
 	 
 	 caption = "Hello World"
     />
+	
+    <OverlayText
+     position  = "0.05, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+	 
+	 caption = "Hello World"
+    />
+	
+	
   </OverlayGroup>
 </Template>

Modified: code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt	2012-05-11 12:53:41 UTC (rev 9172)
+++ code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt	2012-05-11 13:35:56 UTC (rev 9173)
@@ -10,5 +10,6 @@
   FIND_HEADER_FILES
   LINK_LIBRARIES
     orxonox
+	overlays
   SOURCE_FILES ${TOWERDEFENSE_SRC_FILES}
 )