[Orxonox-commit 4432] r9103 - in code/branches/newlevel2012: data/levels src/modules/towerdefense

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-04-20 16:26:03 +0200 (Fri, 20 Apr 2012)
New Revision: 9103

Modified:
   code/branches/newlevel2012/data/levels/towerDefense.oxw
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
Log:
* Changed TowerDefense superclass to DeathMatch
* Updated oxw

Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-20 14:20:04 UTC (rev 9102)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-20 14:26:03 UTC (rev 9103)
@@ -11,12 +11,65 @@
   include("templates/lodInformation.oxt")
 ?>
 
+<!-- Specify the position of the camera -->
+<Template name=playfieldcameras defaults=0>
+  <PongBat>
+    <camerapositions>
+      <CameraPosition position="0,30,0" pitch=-90 absolute=true />
+    </camerapositions>
+  </PongBat>
+</Template>
 
+<!-- Loads the playfield mesh -->
+<Template name=playfield>
+  <PongBat camerapositiontemplate=playfieldcameras>
+    <attached>
+      <Model position="0,0,0" mesh="Playfield_ME.mesh" scale3D="10,10,10" />
+    </attached>
+  </PongBat>
+</Template>
 
-<Level 
-	gametype = "Deathmatch"
-	>
+<Level gametype = "TowerDefense">
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  
+  <?lua include("includes/notifications.oxi") ?>
 
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    
+	<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+    <SpawnPoint spawnclass="PongBat" pawndesign="playfield" position="0, 10, 0" orientation="0, 0, 0" />
+<!--
+    <MovableEntity rotationrate=5 rotationaxis="0,0,1">
+      <attached>
+		  <!-- template wird im centerpoint verwendet (glaub?) -->
+<!--
+        <TowerDefenseCenterpoint 
+			name=towerdefensecenter 
+			dimension="200,120" 
+			>
+			
+			<!--
+			hier fehlt noch was:
+			balltemplate=pongball 
+			-->
+<!--			
+        </PongCenterpoint>
+      </attached>
+    </MovableEntity>
+	-->
+	
+  </Scene>
+</Level>
+
+
+<!--
+<Level gametype = "TowerDefense">
   <templates>
     <Template link=lodtemplate_default />
   </templates>
@@ -41,3 +94,6 @@
   </Scene>
 </Level>
 
+-->
+
+

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-20 14:20:04 UTC (rev 9102)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-20 14:26:03 UTC (rev 9103)
@@ -10,7 +10,7 @@
 
 #include <Gametype.h>
 
-class TowerDefense: public orxonox::Gametype {
+class TowerDefense: public orxonox::Deathmatch {
 public:
 	TowerDefense();
 	virtual ~TowerDefense();