[Orxonox-commit 5727] r10390 - in code/branches/formationFS15/data/levels: . templates

[sborghi at orxonox.net]

Author: sborghi
Date: 2015-04-23 16:08:35 +0200 (Thu, 23 Apr 2015)
New Revision: 10390

Added:
   code/branches/formationFS15/data/levels/templates/orbStation.oxt
Removed:
   code/branches/formationFS15/data/levels/sborghi.oxw
Modified:
   code/branches/formationFS15/data/levels/emptyLevel.oxw
Log:
We copied the blender meshes of the desigend spacestation into a template orbStation.oxt The idea being that the rings of the space station should rotate. Still working on that. The ring will also get a different angle relative to eachother.

Modified: code/branches/formationFS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/formationFS15/data/levels/emptyLevel.oxw	2015-04-23 13:57:17 UTC (rev 10389)
+++ code/branches/formationFS15/data/levels/emptyLevel.oxw	2015-04-23 14:08:35 UTC (rev 10390)
@@ -31,6 +31,16 @@
     <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     
+	
+
+
+<?lua
+  include("templates/orbStation.oxt")
+?>
+	<MovableEntity  position="0,0,0" template="orbStation">
+
+	</MovableEntity>
+
   </Scene>
 </Level>
 

Deleted: code/branches/formationFS15/data/levels/sborghi.oxw
===================================================================
--- code/branches/formationFS15/data/levels/sborghi.oxw	2015-04-23 13:57:17 UTC (rev 10389)
+++ code/branches/formationFS15/data/levels/sborghi.oxw	2015-04-23 14:08:35 UTC (rev 10390)
@@ -1,36 +0,0 @@
-<LevelInfo
- name = "Borghi level"
- description = "A level with absolutely nothing in it."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipEscort.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-    
-  </Scene>
-</Level>
-

Added: code/branches/formationFS15/data/levels/templates/orbStation.oxt
===================================================================
--- code/branches/formationFS15/data/levels/templates/orbStation.oxt	                        (rev 0)
+++ code/branches/formationFS15/data/levels/templates/orbStation.oxt	2015-04-23 14:08:35 UTC (rev 10390)
@@ -0,0 +1,21 @@
+<Template name=orbStation>
+	<MovableEntity>
+
+	<attached>
+		<Model position=“0,0,0“ mesh="OrbStation_Ring_1.mesh" scale="20" angularVelocity="50,0,0"/>
+		<Model position=“0,0,0“ mesh="OrbStation_Ring_2.mesh" scale="20" velocity="40,0,0"/>
+		<Model position=“0,0,0“ mesh="OrbStation_Ring_3.mesh" scale="20" velocity="40,0,0"/>
+		<Model position=“0,0,0“ mesh="OrbStation_Ring_4.mesh" scale="20" />
+		<Model position=“0,0,0“ mesh="OrbStation_Ring_5.mesh" scale="20"/>
+		<Model position=“0,0,0“ mesh="OrbStation_Sphere.mesh" scale="20"/>
+		<Model position=“10,0,0“ mesh="OrbStation_Platform.mesh" scale="20"/>
+
+
+      		<Backlight position="0,0,0" scale=1 colour="0.2, 0.4, 0.8" width=7 length=500 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />
+	</attached>
+
+
+	</MovableEntity>
+</Template>
+	
+