diff --git a/Blenderfiles/exit.blend b/Blenderfiles/exit.blend new file mode 100644 index 0000000..6059b3e Binary files /dev/null and b/Blenderfiles/exit.blend differ diff --git a/Blenderfiles/switch_outer.blend1 b/Blenderfiles/switch_outer.blend1 deleted file mode 100644 index b429aaf..0000000 Binary files a/Blenderfiles/switch_outer.blend1 and /dev/null differ diff --git a/data/geometry/exit.mtl b/data/geometry/exit.mtl new file mode 100644 index 0000000..6d334c6 --- /dev/null +++ b/data/geometry/exit.mtl @@ -0,0 +1,12 @@ +# Blender MTL File: 'exit.blend' +# Material Count: 1 + +newmtl Material.001 +Ns 96.078431 +Ka 0.000000 0.000000 0.000000 +Kd 0.640000 0.640000 0.640000 +Ks 0.500000 0.500000 0.500000 +Ni 1.000000 +d 1.000000 +illum 2 +map_Kd /home/sfroitzheim/swp/data/textures/exitTexture.jpg diff --git a/data/geometry/exit.obj b/data/geometry/exit.obj new file mode 100644 index 0000000..9b361d0 --- /dev/null +++ b/data/geometry/exit.obj @@ -0,0 +1,39 @@ +# Blender v2.72 (sub 0) OBJ File: 'exit.blend' +# www.blender.org +o Plane +v -3.440849 -0.000000 2.993210 +v 3.435127 -0.000000 2.993210 +v -3.440849 -0.000000 -2.993210 +v 3.435127 -0.000000 -2.993210 +v -3.440849 -0.215618 2.993210 +v 3.435127 -0.215618 2.993210 +v -3.440849 -0.215618 -2.993210 +v 3.435127 -0.215618 -2.993210 +v 0.196185 -0.238611 0.123684 +vt 0.000100 0.999900 +vt 0.999900 0.999900 +vt 0.999900 0.000100 +vt 0.999981 0.000019 +vt 0.000019 0.000019 +vt 0.000019 0.036035 +vt 0.999981 0.036035 +vt 0.000100 0.000100 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +s off +f 3/1/1 4/2/1 2/3/1 +f 6/3/2 8/2/2 7/1/2 +f 8/4/3 7/5/3 3/6/3 +f 6/6/4 8/7/4 4/4/4 +f 5/6/5 6/7/5 2/4/5 +f 7/4/6 5/5/6 1/6/6 +f 1/8/1 3/1/1 2/3/1 +f 5/8/2 6/3/2 7/1/2 +f 4/7/3 8/4/3 3/6/3 +f 2/5/4 6/6/4 4/4/4 +f 1/5/5 5/6/5 2/4/5 +f 3/7/6 7/4/6 1/6/6 diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml index c7fb5b2..b805836 100644 --- a/data/levels/Compositions.xml +++ b/data/levels/Compositions.xml @@ -482,7 +482,7 @@ brazier.obj 0.0 - 0.35 + 0.36 0.0 0.0 0.0 @@ -509,6 +509,25 @@ + + + 254 + false + + exit.obj + 0.0 + 0.1 + 0.0 + 0.0 + 0.0 + 0.0 + 1.5 + 0.0 + + + + + @@ -689,3 +708,16 @@ 0.5 true + + + exit.obj + exitTexture.png + 0.1 + 0.6 + 0.4 + 2.0 + TriangleMesh + 0.555 + 0.5 + true + diff --git a/data/levels/Level1.png b/data/levels/Level1.png index a773401..7c4d6c3 100644 Binary files a/data/levels/Level1.png and b/data/levels/Level1.png differ diff --git a/data/levels/Level1.xcf b/data/levels/Level1.xcf index a9b48b7..1ba1652 100644 Binary files a/data/levels/Level1.xcf and b/data/levels/Level1.xcf differ diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml index 9f962fd..d250f65 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -1,3 +1,33 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -215.500000 + 0.0 + 31.500000 + 0 + 137 + 254 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 diff --git a/data/levels/Level1Backup.xml b/data/levels/Level1Backup.xml index 8567b8b..9f962fd 100644 --- a/data/levels/Level1Backup.xml +++ b/data/levels/Level1Backup.xml @@ -1,33 +1,3 @@ - - 1.0 - 0.0 - 0.0 - 0.0 - false - -217.500000 - 0.0 - 210.500000 - 0 - 137 - 245 - - - - false - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - 1.0 0.0 diff --git a/data/textures/exitTexture.png b/data/textures/exitTexture.png new file mode 100644 index 0000000..645d1fa Binary files /dev/null and b/data/textures/exitTexture.png differ