[Orxonox-commit 7517] r12123 - code/branches/shader_HS18/data/levels
wiesep at orxonox.net
wiesep at orxonox.net
Wed Nov 28 11:36:23 CET 2018
Author: wiesep
Date: 2018-11-28 11:36:23 +0100 (Wed, 28 Nov 2018)
New Revision: 12123
Added:
code/branches/shader_HS18/data/levels/BumpMap.oxw
Removed:
code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
Log:
Renamed leve
Added: code/branches/shader_HS18/data/levels/BumpMap.oxw
===================================================================
--- code/branches/shader_HS18/data/levels/BumpMap.oxw (rev 0)
+++ code/branches/shader_HS18/data/levels/BumpMap.oxw 2018-11-28 10:36:23 UTC (rev 12123)
@@ -0,0 +1,82 @@
+<!-- Author: Philip Wiese <wiesep at student.ethz.ch> -->
+<LevelInfo
+ name = "BumpMap"
+ description = "A demonstration of bump maps (created HS18)"
+ tags = "test, showcase"
+ screenshot = "bumpMap.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipEscort.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ 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"/>
+ -->
+
+ <Light type=point position="100,30,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,30,200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
+
+ <Light type=point position="-20,-30,-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="-20,-30,-200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
+
+ <Light type=point position="20,200,20" lookat="0,0,0" diffuse="0.3, 0.3, 0.3, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
+ <Model position="20,200,20" 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"/>
+
+ <Light type=point position="20,-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="20,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+
+ <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"/>
+
+ <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="-80,0,0" 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, 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,40" rotationrate="30" 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,0" rotationrate="30" rotationaxis="1,0,1">
+ <attached>
+ <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
+ </attached>
+ </MovableEntity>
+ <MovableEntity position="0,0,-40" rotationrate="30" rotationaxis="1,0,1">
+ <attached>
+ <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2_Normal_Blank.mesh" />
+ </attached>
+ </MovableEntity>
+
+ </Scene>
+</Level>
Deleted: code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
===================================================================
--- code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw 2018-11-28 10:35:37 UTC (rev 12122)
+++ code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw 2018-11-28 10:36:23 UTC (rev 12123)
@@ -1,81 +0,0 @@
-<LevelInfo
- name = "ShaderHS18 Test"
- description = "A leve for testing different shader"
- tags = "test, showcase"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
-?>
-
-<?lua
- include("templates/spaceshipEscort.oxt")
-?>
-
-<Level>
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "0.5, 0.5, 0.5"
- 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"/>
- -->
-
- <Light type=point position="100,30,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,30,200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
-
- <Light type=point position="-20,-30,-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="-20,-30,-200" mesh="rocket.mesh" scale="3" lookat="0,0,0"/>
-
- <Light type=point position="20,200,20" lookat="0,0,0" diffuse="0.3, 0.3, 0.3, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
- <Model position="20,200,20" 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"/>
-
- <Light type=point position="20,-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="20,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
-
- <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"/>
-
- <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="-80,0,0" 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, 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,40" rotationrate="30" 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,0" rotationrate="30" rotationaxis="1,0,1">
- <attached>
- <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
- </attached>
- </MovableEntity>
- <MovableEntity position="0,0,-40" rotationrate="30" rotationaxis="1,0,1">
- <attached>
- <Model position="0, 0,0" roll="45" scale="10" mesh="Cube_Lava_V2_Normal_Blank.mesh" />
- </attached>
- </MovableEntity>
-
- </Scene>
-</Level>
More information about the Orxonox-commit
mailing list