Changeset 12113 for code/branches/shader_HS18

Timestamp:

Nov 21, 2018, 12:01:38 PM (5 years ago)

Author:

wiesep

Message:

Rotating cubes

Location:

code/branches/shader_HS18/data/levels

Files:

• ShaderHS18_Test.oxw (modified) (2 diffs)
• tutorial.oxw (modified) (1 diff)

code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw

@@ -32 +32 @@
   -->
 
-    <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"/>
@@ -50 +52 @@
     <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>

code/branches/shader_HS18/data/levels/tutorial.oxw

@@ -55 +55 @@
     <?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>