[Orxonox-commit 4633] r9304 - in code/branches/presentation2012merge/data: levels overlays

[jo at orxonox.net]

Author: jo
Date: 2012-06-17 23:04:25 +0200 (Sun, 17 Jun 2012)
New Revision: 9304

Added:
   code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo
Modified:
   code/branches/presentation2012merge/data/levels/tetris.oxw
Log:
Added tetris HUD template and some eye candy for the level.

Modified: code/branches/presentation2012merge/data/levels/tetris.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/tetris.oxw	2012-06-17 16:38:14 UTC (rev 9303)
+++ code/branches/presentation2012merge/data/levels/tetris.oxw	2012-06-17 21:04:25 UTC (rev 9304)
@@ -8,9 +8,15 @@
 <?lua
   include("HUDTemplates3.oxo")
   include("stats.oxo")
+  include("tetrisHUD.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipSwallow.oxt")
+  include("templates/spaceshipTransporter.oxt")
+  include("templates/spaceshipH2.oxt")
 ?>
-<!-- include("tetrisHUD.oxo") -->
 
 <Template name=tetrisstonecameras defaults=0>
   <TetrisStone>
@@ -96,7 +102,88 @@
     	asteroidBelt(10000, 0, 0, -40, -90, 70, 100, 200, 24000, 20000, 500, 0)
 
     ?>
-
-
+<!-- -------- 4 spaceships rotating around the tetris field --------- -->
+    <SpaceShip position="500,500,400" lookat="0,0,0">
+      <templates>
+        <Template link=spaceshipswallow />
+      </templates>
+      <controller>
+        <WaypointController team=10>
+          <waypoints>
+            <Model mesh="cube.mesh" scale=0 position="1000,-75,0" />
+            <Model mesh="cube.mesh" scale=0 position="650,-75,650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,-75,1000" />
+            <Model mesh="cube.mesh" scale=0 position="-700,-75,650" />
+            <Model mesh="cube.mesh" scale=0 position="-1000,-75,0" />
+            <Model mesh="cube.mesh" scale=0 position="-700,-75,-650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,-75,-1000" />
+            <Model mesh="cube.mesh" scale=0 position="650,-75,-650" />
+          </waypoints>
+        </WaypointController>
+      </controller>
+    </SpaceShip>
+    
+   <SpaceShip position="-500,-500,-400" lookat="0,0,0">
+      <templates>
+        <Template link=spaceshippirate />
+      </templates>
+      <controller>
+        <WaypointController team=10>
+          <waypoints>
+            <Model mesh="cube.mesh" scale=0 position="-1000,-200,0" />
+            <Model mesh="cube.mesh" scale=0 position="-700,-150,650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,-75,1000" />
+            <Model mesh="cube.mesh" scale=0 position="650,100,650" />          
+            <Model mesh="cube.mesh" scale=0 position="1000,150,0" />
+            <Model mesh="cube.mesh" scale=0 position="650,100,-650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,0,-1000" />
+            <Model mesh="cube.mesh" scale=0 position="-700,-100,-650" />
+          </waypoints>
+        </WaypointController>
+      </controller>
+    </SpaceShip>
+    
+       <SpaceShip position="-600,500,400" lookat="0,0,0">
+      <templates>
+        <Template link=spaceshipghost />
+      </templates>
+      <controller>
+        <WaypointController team=10>
+          <waypoints>
+            <Model mesh="cube.mesh" scale=0 position="-700,200,650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,100,1000" />
+            <Model mesh="cube.mesh" scale=0 position="650,0,650" />          
+            <Model mesh="cube.mesh" scale=0 position="1000,-100,0" />
+            <Model mesh="cube.mesh" scale=0 position="650,0,-650" />
+            <Model mesh="cube.mesh" scale=0 position="-55,100,-1000" />
+            <Model mesh="cube.mesh" scale=0 position="-700,200,-650" />
+            <Model mesh="cube.mesh" scale=0 position="-1000,300,0" />
+          </waypoints>
+        </WaypointController>
+      </controller>
+    </SpaceShip>
+    
+    <SpaceShip position="1000,-75,0" lookat="0,0,0">
+      <templates>
+        <Template link=spaceshipHtwo />
+      </templates>
+      <controller>
+        <WaypointController team=10>
+          <waypoints>
+            <Model mesh="cube.mesh" scale=10 position="400,240,400" />
+            <Model mesh="cube.mesh" scale=10 position="-55,240,700" />
+            <Model mesh="cube.mesh" scale=10 position="-500,240,400" />
+            <Model mesh="cube.mesh" scale=10 position="-700,240,0" />
+            <Model mesh="cube.mesh" scale=10 position="-500,240,-400" />
+            <Model mesh="cube.mesh" scale=10 position="-55,240,-700" />
+            <Model mesh="cube.mesh" scale=10 position="400,240,-400" />
+            <Model mesh="cube.mesh" scale=10 position="700,240,0" />
+          </waypoints>
+        </WaypointController>
+      </controller>
+    </SpaceShip>
+    
+    
+    
   </Scene>
 </Level>

Added: code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo
===================================================================
--- code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo	                        (rev 0)
+++ code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo	2012-06-17 21:04:25 UTC (rev 9304)
@@ -0,0 +1,37 @@
+<Template name="TetrisHUD">
+  <OverlayGroup name="TetrisHUD" scale = "1, 1">
+    <TetrisScore
+     position  = "0.9, 0.1"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+    />
+
+    <OverlayText
+     position  = "0.7, 0.10"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     caption   = "Points: "
+    />
+    
+    <OverlayText
+     position  = "0.7, 0.20"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.05
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     caption   = "Next Brick"
+    />
+    
+    
+
+  </OverlayGroup>
+</Template>