]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
evil5 reflections
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 12:02:12 +0000 (14:02 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 12:02:12 +0000 (14:02 +0200)
20 files changed:
data/scripts/evil5.shader [deleted file]
data/scripts/evil5_floor.shader [new file with mode: 0644]
data/scripts/evil5_metal.shader [new file with mode: 0644]
data/scripts/evil5_trim.shader [new file with mode: 0644]
data/scripts/shaderlist.txt
data/textures/evil5_floor/confllr_reflect.JPG [new file with mode: 0644]
data/textures/evil5_floor/confllrtile2pad_reflect.JPG [new file with mode: 0644]
data/textures/evil5_floor/tekconfllr_reflect.tga [new file with mode: 0644]
data/textures/evil5_metal/dkmtl_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/drkrstmtl_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtl_smllpnls2btm_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtl_smllpnls2grll2_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtl_smllpnls_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtl_wrnpnls2_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtl_wrnpnls_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/rstmtlbxfrm_reflect.JPG [new file with mode: 0644]
data/textures/evil5_metal/walltek2_reflect.JPG [new file with mode: 0644]
data/textures/evil5_trim/trimrstmtlpipes_reflect.JPG [new file with mode: 0644]
data/textures/evil5_trim/trstmtl_panel_reflect.JPG [new file with mode: 0644]
data/textures/evil5_trim/trstmtl_panelbig_reflect.JPG [new file with mode: 0644]

diff --git a/data/scripts/evil5.shader b/data/scripts/evil5.shader
deleted file mode 100644 (file)
index 422b5bf..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-// Maj Notes\r
-// =========\r
-// Changes:\r
-// * Indentation fixed\r
-// * rgbgen identity's that weren't needed were removed\r
-// * For all alphafunc'd shaders:\r
-//   o Added surfaceparm trans, alphashadow and nomarks\r
-//   o Removed blendfunc's that weren't needed because they were in the same stage as a alphafunc\r
-//   o Changed alphafunc GT0's to GE128 - GT0 didn't look right\r
-// * Changed all GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA's to blend (they do the same thing)\r
-// * Changed all GL_DST_COLOR GL_ZERO's to filter (they do the same thing)\r
-// * Duplicate of textures/evil_floor/flr_drmtlodhlz renamed to flr_mtlhls\r
-// * Changed textures/evil_floor/tekconfllr_fx to use alphafunc rather then alpha blending\r
-// * Removed unnecessary blendfunc blend's from first stage of all lights\r
-// * Changed a flr_drmtlodhlz.tga to flr_dkmtlodhlz.tga (was drm instead of dkm)\r
-\r
-//floors\r
-\r
-textures/evil5_floor/confllrtile2pad\r
-{\r
-       {\r
-               map textures/evil5_floor/confllrtile2pad.tga\r
-               blendFunc blend\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-       }\r
-}\r
-\r
-textures/evil5_floor/tekconfllr_fx\r
-{\r
-       surfaceparm trans\r
-       surfaceparm alphashadow\r
-       surfaceparm nomarks\r
-       cull none\r
-       {\r
-               map textures/evil5_floor/tekconfllr_fx.tga\r
-               tcmod scroll 0 .9\r
-               alphafunc GE128\r
-               depthwrite\r
-       }\r
-       {\r
-               map textures/evil5_floor/tekconfllr.tga\r
-               alphafunc GE128\r
-               depthwrite\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               depthfunc equal\r
-       }\r
-}\r
diff --git a/data/scripts/evil5_floor.shader b/data/scripts/evil5_floor.shader
new file mode 100644 (file)
index 0000000..29ea404
--- /dev/null
@@ -0,0 +1,50 @@
+textures/evil5_floor/confllr_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_floor/confllr_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_floor/confllrtile2pad\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_floor/confllrtile2pad.tga\r
+               blendFunc blend\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+\r
+textures/evil5_floor/tekconfllr_fx\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       surfaceparm trans\r
+       surfaceparm alphashadow\r
+       surfaceparm nomarks\r
+       cull none\r
+       {\r
+               map textures/evil5_floor/tekconfllr_fx.tga\r
+               tcmod scroll 0 .9\r
+               alphafunc GE128\r
+               depthwrite\r
+       }\r
+       {\r
+               map textures/evil5_floor/tekconfllr.tga\r
+               alphafunc GE128\r
+               depthwrite\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               depthfunc equal\r
+       }\r
+}
\ No newline at end of file
diff --git a/data/scripts/evil5_metal.shader b/data/scripts/evil5_metal.shader
new file mode 100644 (file)
index 0000000..d567d18
--- /dev/null
@@ -0,0 +1,116 @@
+textures/evil5_metal/dkmtl_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/dkmtl_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/drkrstmtl_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/drkrstmtl_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtl_smllpnls_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtl_smllpnls_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtl_smllpnls2btm_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtl_smllpnls2btm_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtl_smllpnls2grll2_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtl_smllpnls2grll2_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtl_wrnpnls_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtl_wrnpnls_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtl_wrnpnls2_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtl_wrnpnls2_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/rstmtlbxfrm_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/rstmtlbxfrm_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_metal/walltek2_reflect\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_metal/walltek2_reflect\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}
\ No newline at end of file
diff --git a/data/scripts/evil5_trim.shader b/data/scripts/evil5_trim.shader
new file mode 100644 (file)
index 0000000..873aa6a
--- /dev/null
@@ -0,0 +1,38 @@
+textures/evil5_trim/trimrstmtlpipes\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_trim/trimrstmtlpipes\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_trim/trstmtl_panel\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_trim/trstmtl_panel\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}\r
+\r
+textures/evil5_trim/trstmtl_panelbig\r
+{\r
+       dpreflectcube cubemaps/exomorph/exomorph\r
+       {\r
+               map textures/evil5_trim/trstmtl_panelbig\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc GL_DST_COLOR GL_ZERO\r
+               rgbGen identity\r
+    }\r
+}
\ No newline at end of file
index 5b4ca1fec899a1b311ab88159612d927edf3d5b4..d0e9a1245a3e5fa5e9b454e9415e305d0bc3b79c 100644 (file)
@@ -32,7 +32,9 @@ evil4_metals
 evil4_techfloors\r
 evil4_techtrims\r
 evil4_techwalls\r
-evil5\r
+evil5_floor\r
+evil5_metal\r
+evil5_trim\r
 evil6_floors\r
 evil6_lights\r
 evil6_support\r
diff --git a/data/textures/evil5_floor/confllr_reflect.JPG b/data/textures/evil5_floor/confllr_reflect.JPG
new file mode 100644 (file)
index 0000000..f642edb
Binary files /dev/null and b/data/textures/evil5_floor/confllr_reflect.JPG differ
diff --git a/data/textures/evil5_floor/confllrtile2pad_reflect.JPG b/data/textures/evil5_floor/confllrtile2pad_reflect.JPG
new file mode 100644 (file)
index 0000000..7fccae7
Binary files /dev/null and b/data/textures/evil5_floor/confllrtile2pad_reflect.JPG differ
diff --git a/data/textures/evil5_floor/tekconfllr_reflect.tga b/data/textures/evil5_floor/tekconfllr_reflect.tga
new file mode 100644 (file)
index 0000000..498dd84
Binary files /dev/null and b/data/textures/evil5_floor/tekconfllr_reflect.tga differ
diff --git a/data/textures/evil5_metal/dkmtl_reflect.JPG b/data/textures/evil5_metal/dkmtl_reflect.JPG
new file mode 100644 (file)
index 0000000..e6dedba
Binary files /dev/null and b/data/textures/evil5_metal/dkmtl_reflect.JPG differ
diff --git a/data/textures/evil5_metal/drkrstmtl_reflect.JPG b/data/textures/evil5_metal/drkrstmtl_reflect.JPG
new file mode 100644 (file)
index 0000000..e1b84a5
Binary files /dev/null and b/data/textures/evil5_metal/drkrstmtl_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtl_smllpnls2btm_reflect.JPG b/data/textures/evil5_metal/rstmtl_smllpnls2btm_reflect.JPG
new file mode 100644 (file)
index 0000000..998671a
Binary files /dev/null and b/data/textures/evil5_metal/rstmtl_smllpnls2btm_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtl_smllpnls2grll2_reflect.JPG b/data/textures/evil5_metal/rstmtl_smllpnls2grll2_reflect.JPG
new file mode 100644 (file)
index 0000000..fc3c4e2
Binary files /dev/null and b/data/textures/evil5_metal/rstmtl_smllpnls2grll2_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtl_smllpnls_reflect.JPG b/data/textures/evil5_metal/rstmtl_smllpnls_reflect.JPG
new file mode 100644 (file)
index 0000000..f8a0ae6
Binary files /dev/null and b/data/textures/evil5_metal/rstmtl_smllpnls_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtl_wrnpnls2_reflect.JPG b/data/textures/evil5_metal/rstmtl_wrnpnls2_reflect.JPG
new file mode 100644 (file)
index 0000000..2daa256
Binary files /dev/null and b/data/textures/evil5_metal/rstmtl_wrnpnls2_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtl_wrnpnls_reflect.JPG b/data/textures/evil5_metal/rstmtl_wrnpnls_reflect.JPG
new file mode 100644 (file)
index 0000000..ec594de
Binary files /dev/null and b/data/textures/evil5_metal/rstmtl_wrnpnls_reflect.JPG differ
diff --git a/data/textures/evil5_metal/rstmtlbxfrm_reflect.JPG b/data/textures/evil5_metal/rstmtlbxfrm_reflect.JPG
new file mode 100644 (file)
index 0000000..4882e7b
Binary files /dev/null and b/data/textures/evil5_metal/rstmtlbxfrm_reflect.JPG differ
diff --git a/data/textures/evil5_metal/walltek2_reflect.JPG b/data/textures/evil5_metal/walltek2_reflect.JPG
new file mode 100644 (file)
index 0000000..8e2fbc9
Binary files /dev/null and b/data/textures/evil5_metal/walltek2_reflect.JPG differ
diff --git a/data/textures/evil5_trim/trimrstmtlpipes_reflect.JPG b/data/textures/evil5_trim/trimrstmtlpipes_reflect.JPG
new file mode 100644 (file)
index 0000000..b445ba8
Binary files /dev/null and b/data/textures/evil5_trim/trimrstmtlpipes_reflect.JPG differ
diff --git a/data/textures/evil5_trim/trstmtl_panel_reflect.JPG b/data/textures/evil5_trim/trstmtl_panel_reflect.JPG
new file mode 100644 (file)
index 0000000..9d733ec
Binary files /dev/null and b/data/textures/evil5_trim/trstmtl_panel_reflect.JPG differ
diff --git a/data/textures/evil5_trim/trstmtl_panelbig_reflect.JPG b/data/textures/evil5_trim/trstmtl_panelbig_reflect.JPG
new file mode 100644 (file)
index 0000000..184148b
Binary files /dev/null and b/data/textures/evil5_trim/trstmtl_panelbig_reflect.JPG differ