First attempt to add world reflections, using the default cubemap

diff --git a/data/scripts/evil1_floors.shader b/data/scripts/evil1_floors.shader
new file mode 100644 (file)
index 0000000..d3dcf93
--- /dev/null
+++ b/data/scripts/evil1_floors.shader
@@ -0,0 +1,298 @@
+textures/evil1_floors/br_tiles\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/br_tiles\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/br_tiles_blood\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/br_tiles_blood\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/br_tiles_brkblood\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/br_tiles_brkblood\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/br_tiles_broke\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/br_tiles_broke\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/br_tiles_broke2\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/br_tiles_broke2\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortech1\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortech1\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortile1\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortile1\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortile1b\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortile1b\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortile1bbrown\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortile1bbrown\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortilebig\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortilebig\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortilebig1b\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortilebig1b\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/floortilebig2\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/floortilebig2\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/flr_grts\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/flr_grts\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/flr_grtswrn\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/flr_grtswrn\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/metalflr1\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/metalflr1\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/metalflr1c\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/metalflr1c\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/mtl_flooring\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/mtl_flooring\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/stile_cln\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/stile_cln\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/stile_drty_brk\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/stile_drty_brk\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/stile_drty_brk2\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/stile_drty_brk2\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/stile_drty\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/stile_drty\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/tile_brn_lite\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/tile_brn_lite\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil1_floors/tile_brn\r
+{\r
+       dpreflectcube cubemaps/default/sky\r
+       {\r
+               map textures/evil1_floors/tile_brn\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r

diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index b4a0bf0d3cba7813acf9073e19dd3f0c74be755c..31af1ca4bf885f2c3de7cf024d3152f725288fde 100644 (file)
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -9,6 +9,7 @@ dsi
 e7\r
 egyptsoc\r
 el3dm1\r
+evil1_floors\r
 evil1_grates\r
 evil2\r
 evil3\r

diff --git a/data/textures/evil1_floors/br_tiles_blood_reflect.jpg b/data/textures/evil1_floors/br_tiles_blood_reflect.jpg
new file mode 100644 (file)
index 0000000..655bde4
Binary files /dev/null and b/data/textures/evil1_floors/br_tiles_blood_reflect.jpg differ

diff --git a/data/textures/evil1_floors/br_tiles_brkblood_reflect.jpg b/data/textures/evil1_floors/br_tiles_brkblood_reflect.jpg
new file mode 100644 (file)
index 0000000..3a8a8e0
Binary files /dev/null and b/data/textures/evil1_floors/br_tiles_brkblood_reflect.jpg differ

diff --git a/data/textures/evil1_floors/br_tiles_broke2_reflect.jpg b/data/textures/evil1_floors/br_tiles_broke2_reflect.jpg
new file mode 100644 (file)
index 0000000..c72dbc0
Binary files /dev/null and b/data/textures/evil1_floors/br_tiles_broke2_reflect.jpg differ

diff --git a/data/textures/evil1_floors/br_tiles_broke_reflect.jpg b/data/textures/evil1_floors/br_tiles_broke_reflect.jpg
new file mode 100644 (file)
index 0000000..cdab129
Binary files /dev/null and b/data/textures/evil1_floors/br_tiles_broke_reflect.jpg differ

diff --git a/data/textures/evil1_floors/br_tiles_reflect.jpg b/data/textures/evil1_floors/br_tiles_reflect.jpg
new file mode 100644 (file)
index 0000000..03fe079
Binary files /dev/null and b/data/textures/evil1_floors/br_tiles_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortech1_reflect.jpg b/data/textures/evil1_floors/floortech1_reflect.jpg
new file mode 100644 (file)
index 0000000..0d4b911
Binary files /dev/null and b/data/textures/evil1_floors/floortech1_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortile1_reflect.jpg b/data/textures/evil1_floors/floortile1_reflect.jpg
new file mode 100644 (file)
index 0000000..95d7e6e
Binary files /dev/null and b/data/textures/evil1_floors/floortile1_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortile1b_reflect.jpg b/data/textures/evil1_floors/floortile1b_reflect.jpg
new file mode 100644 (file)
index 0000000..af5029c
Binary files /dev/null and b/data/textures/evil1_floors/floortile1b_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortile1bbrown_reflect.jpg b/data/textures/evil1_floors/floortile1bbrown_reflect.jpg
new file mode 100644 (file)
index 0000000..8252499
Binary files /dev/null and b/data/textures/evil1_floors/floortile1bbrown_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortilebig1b_reflect.jpg b/data/textures/evil1_floors/floortilebig1b_reflect.jpg
new file mode 100644 (file)
index 0000000..b42da21
Binary files /dev/null and b/data/textures/evil1_floors/floortilebig1b_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortilebig2_reflect.jpg b/data/textures/evil1_floors/floortilebig2_reflect.jpg
new file mode 100644 (file)
index 0000000..dfcccfe
Binary files /dev/null and b/data/textures/evil1_floors/floortilebig2_reflect.jpg differ

diff --git a/data/textures/evil1_floors/floortilebig_reflect.jpg b/data/textures/evil1_floors/floortilebig_reflect.jpg
new file mode 100644 (file)
index 0000000..3110436
Binary files /dev/null and b/data/textures/evil1_floors/floortilebig_reflect.jpg differ

diff --git a/data/textures/evil1_floors/flr_grts_reflect.jpg b/data/textures/evil1_floors/flr_grts_reflect.jpg
new file mode 100644 (file)
index 0000000..72310ea
Binary files /dev/null and b/data/textures/evil1_floors/flr_grts_reflect.jpg differ

diff --git a/data/textures/evil1_floors/flr_grtswrn_reflect.jpg b/data/textures/evil1_floors/flr_grtswrn_reflect.jpg
new file mode 100644 (file)
index 0000000..28c3559
Binary files /dev/null and b/data/textures/evil1_floors/flr_grtswrn_reflect.jpg differ

diff --git a/data/textures/evil1_floors/metalflr1_reflect.jpg b/data/textures/evil1_floors/metalflr1_reflect.jpg
new file mode 100644 (file)
index 0000000..fb07282
Binary files /dev/null and b/data/textures/evil1_floors/metalflr1_reflect.jpg differ

diff --git a/data/textures/evil1_floors/metalflr1c_reflect.jpg b/data/textures/evil1_floors/metalflr1c_reflect.jpg
new file mode 100644 (file)
index 0000000..187bd9b
Binary files /dev/null and b/data/textures/evil1_floors/metalflr1c_reflect.jpg differ

diff --git a/data/textures/evil1_floors/mtl_flooring_reflect.jpg b/data/textures/evil1_floors/mtl_flooring_reflect.jpg
new file mode 100644 (file)
index 0000000..9655e6d
Binary files /dev/null and b/data/textures/evil1_floors/mtl_flooring_reflect.jpg differ

diff --git a/data/textures/evil1_floors/stile_cln_reflect.jpg b/data/textures/evil1_floors/stile_cln_reflect.jpg
new file mode 100644 (file)
index 0000000..57c47f0
Binary files /dev/null and b/data/textures/evil1_floors/stile_cln_reflect.jpg differ

diff --git a/data/textures/evil1_floors/stile_drty_brk2_reflect.jpg b/data/textures/evil1_floors/stile_drty_brk2_reflect.jpg
new file mode 100644 (file)
index 0000000..6df545d
Binary files /dev/null and b/data/textures/evil1_floors/stile_drty_brk2_reflect.jpg differ

diff --git a/data/textures/evil1_floors/stile_drty_brk_reflect.jpg b/data/textures/evil1_floors/stile_drty_brk_reflect.jpg
new file mode 100644 (file)
index 0000000..27e46e6
Binary files /dev/null and b/data/textures/evil1_floors/stile_drty_brk_reflect.jpg differ

diff --git a/data/textures/evil1_floors/stile_drty_reflect.jpg b/data/textures/evil1_floors/stile_drty_reflect.jpg
new file mode 100644 (file)
index 0000000..500faae
Binary files /dev/null and b/data/textures/evil1_floors/stile_drty_reflect.jpg differ

diff --git a/data/textures/evil1_floors/tile_brn_lite_reflect.jpg b/data/textures/evil1_floors/tile_brn_lite_reflect.jpg
new file mode 100644 (file)
index 0000000..ba779c7
Binary files /dev/null and b/data/textures/evil1_floors/tile_brn_lite_reflect.jpg differ

diff --git a/data/textures/evil1_floors/tile_brn_reflect.jpg b/data/textures/evil1_floors/tile_brn_reflect.jpg
new file mode 100644 (file)
index 0000000..890d486
Binary files /dev/null and b/data/textures/evil1_floors/tile_brn_reflect.jpg differ