[Orxonox-commit 7507] r12113 - code/branches/shader_HS18/data/levels

[wiesep at orxonox.net]

Author: wiesep
Date: 2018-11-21 12:01:38 +0100 (Wed, 21 Nov 2018)
New Revision: 12113

Modified:
   code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
   code/branches/shader_HS18/data/levels/tutorial.oxw
Log:
Rotating cubes

Modified: code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
===================================================================
--- code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw	2018-11-21 11:01:01 UTC (rev 12112)
+++ code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw	2018-11-21 11:01:38 UTC (rev 12113)
@@ -31,11 +31,13 @@
     <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"/>
   -->
 
-    <Light type=point position="100,0,300" lookat="0,0,0" diffuse="0.5, 0.5, 0.5, 1.0" specular="0.5, 0.9, 0.9, 1.0"/>
-    <Model position="100,0,200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+    <Light type=point position="100,0,300" lookat="0,0,0" diffuse="0.8, 0.8, 0.8, 1.0" specular="0.5, 0.9, 0.9, 1.0"/>
+    <Model position="100,0,200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
 
-    <Light type=point position="100,0,-200" lookat="0,0,0" diffuse="0.5, 0.5, 0.5, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
-    <Model position="100,0,-200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+    <Light type=point position="100,0,-200" lookat="0,0,0" diffuse="0.8, 0.8, 0.8, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
+    <Model position="100,0,-200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
+     <Light type=point position="-200,0,0" lookat="0,0,0" diffuse="0.3, 0.3, 0.3, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
+    <Model position="-200,0,0" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
 <!--
     <Light type=point position="100,200,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <Model position="100,200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
@@ -49,12 +51,28 @@
     <Light type=point position="-200,0,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <Model position="-200,0,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
 -->
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <SpawnPoint team=0 position="60,0,-20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
     <!--<Model position="0, -50,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="Cube_Lava.mesh" />
-    <Model position="0, 0,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="Cube_Lava_Normal.mesh" />-->
+    <Model position="0, 0,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="Cube_Lava_Normal.mesh" />
     <Model position="0, 12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2.mesh" />
     <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
+    -->
 
+    <MovableEntity position="0,0,20" rotationrate="50" rotationaxis="1,0,1">
+      <attached>
+          <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2.mesh" />
+      </attached>
+    </MovableEntity>
+
+    <MovableEntity position="0,0,-20" rotationrate="50" rotationaxis="1,0,1">
+      <attached>
+          <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
+      </attached>
+    </MovableEntity>
+
+     <GlobalShader compositor="BW" visible=true>
+    </GlobalShader>
+
   </Scene>
 </Level>

Modified: code/branches/shader_HS18/data/levels/tutorial.oxw
===================================================================
--- code/branches/shader_HS18/data/levels/tutorial.oxw	2018-11-21 11:01:01 UTC (rev 12112)
+++ code/branches/shader_HS18/data/levels/tutorial.oxw	2018-11-21 11:01:38 UTC (rev 12113)
@@ -54,10 +54,10 @@
       <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=shipselection />
     <?lua end ?>
 
-    <GlobalShader compositor="Bloom" visible=false>
+    <GlobalShader compositor="Bloom" visible=true>
       <events>
         <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
+          <DistanceTrigger position="0,0,0" distance=300 target="Spectator" switch=false />
         </visibility>
       </events>
     </GlobalShader>