From: MirceaKitsune Date: Sat, 28 Jan 2012 12:02:12 +0000 (+0200) Subject: evil5 reflections X-Git-Url: https://git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=61a5fad8671a9c60ca5c479431efea49b3822de4 evil5 reflections --- diff --git a/data/scripts/evil5.shader b/data/scripts/evil5.shader deleted file mode 100644 index 422b5bfa..00000000 --- a/data/scripts/evil5.shader +++ /dev/null @@ -1,53 +0,0 @@ -// Maj Notes -// ========= -// Changes: -// * Indentation fixed -// * rgbgen identity's that weren't needed were removed -// * For all alphafunc'd shaders: -// o Added surfaceparm trans, alphashadow and nomarks -// o Removed blendfunc's that weren't needed because they were in the same stage as a alphafunc -// o Changed alphafunc GT0's to GE128 - GT0 didn't look right -// * Changed all GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA's to blend (they do the same thing) -// * Changed all GL_DST_COLOR GL_ZERO's to filter (they do the same thing) -// * Duplicate of textures/evil_floor/flr_drmtlodhlz renamed to flr_mtlhls -// * Changed textures/evil_floor/tekconfllr_fx to use alphafunc rather then alpha blending -// * Removed unnecessary blendfunc blend's from first stage of all lights -// * Changed a flr_drmtlodhlz.tga to flr_dkmtlodhlz.tga (was drm instead of dkm) - -//floors - -textures/evil5_floor/confllrtile2pad -{ - { - map textures/evil5_floor/confllrtile2pad.tga - blendFunc blend - } - { - map $lightmap - blendfunc filter - } -} - -textures/evil5_floor/tekconfllr_fx -{ - surfaceparm trans - surfaceparm alphashadow - surfaceparm nomarks - cull none - { - map textures/evil5_floor/tekconfllr_fx.tga - tcmod scroll 0 .9 - alphafunc GE128 - depthwrite - } - { - map textures/evil5_floor/tekconfllr.tga - alphafunc GE128 - depthwrite - } - { - map $lightmap - blendfunc filter - depthfunc equal - } -} diff --git a/data/scripts/evil5_floor.shader b/data/scripts/evil5_floor.shader new file mode 100644 index 00000000..29ea4047 --- /dev/null +++ b/data/scripts/evil5_floor.shader @@ -0,0 +1,50 @@ +textures/evil5_floor/confllr_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_floor/confllr_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_floor/confllrtile2pad +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_floor/confllrtile2pad.tga + blendFunc blend + } + { + map $lightmap + blendfunc filter + } +} + +textures/evil5_floor/tekconfllr_fx +{ + dpreflectcube cubemaps/exomorph/exomorph + surfaceparm trans + surfaceparm alphashadow + surfaceparm nomarks + cull none + { + map textures/evil5_floor/tekconfllr_fx.tga + tcmod scroll 0 .9 + alphafunc GE128 + depthwrite + } + { + map textures/evil5_floor/tekconfllr.tga + alphafunc GE128 + depthwrite + } + { + map $lightmap + blendfunc filter + depthfunc equal + } +} \ No newline at end of file diff --git a/data/scripts/evil5_metal.shader b/data/scripts/evil5_metal.shader new file mode 100644 index 00000000..d567d18d --- /dev/null +++ b/data/scripts/evil5_metal.shader @@ -0,0 +1,116 @@ +textures/evil5_metal/dkmtl_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/dkmtl_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/drkrstmtl_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/drkrstmtl_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtl_smllpnls_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtl_smllpnls_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtl_smllpnls2btm_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtl_smllpnls2btm_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtl_smllpnls2grll2_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtl_smllpnls2grll2_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtl_wrnpnls_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtl_wrnpnls_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtl_wrnpnls2_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtl_wrnpnls2_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/rstmtlbxfrm_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/rstmtlbxfrm_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_metal/walltek2_reflect +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_metal/walltek2_reflect + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} \ No newline at end of file diff --git a/data/scripts/evil5_trim.shader b/data/scripts/evil5_trim.shader new file mode 100644 index 00000000..873aa6a8 --- /dev/null +++ b/data/scripts/evil5_trim.shader @@ -0,0 +1,38 @@ +textures/evil5_trim/trimrstmtlpipes +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_trim/trimrstmtlpipes + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_trim/trstmtl_panel +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_trim/trstmtl_panel + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} + +textures/evil5_trim/trstmtl_panelbig +{ + dpreflectcube cubemaps/exomorph/exomorph + { + map textures/evil5_trim/trstmtl_panelbig + } + { + map $lightmap + blendfunc GL_DST_COLOR GL_ZERO + rgbGen identity + } +} \ No newline at end of file diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt index 5b4ca1fe..d0e9a124 100644 --- a/data/scripts/shaderlist.txt +++ b/data/scripts/shaderlist.txt @@ -32,7 +32,9 @@ evil4_metals evil4_techfloors evil4_techtrims evil4_techwalls -evil5 +evil5_floor +evil5_metal +evil5_trim evil6_floors evil6_lights evil6_support diff --git a/data/textures/evil5_floor/confllr_reflect.JPG b/data/textures/evil5_floor/confllr_reflect.JPG new file mode 100644 index 00000000..f642edb4 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 index 00000000..7fccae7c 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 index 00000000..498dd843 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 index 00000000..e6dedbaa 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 index 00000000..e1b84a59 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 index 00000000..998671ae 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 index 00000000..fc3c4e2e 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 index 00000000..f8a0ae6b 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 index 00000000..2daa2560 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 index 00000000..ec594de1 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 index 00000000..4882e7b8 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 index 00000000..8e2fbc95 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 index 00000000..b445ba89 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 index 00000000..9d733eca 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 index 00000000..184148b8 Binary files /dev/null and b/data/textures/evil5_trim/trstmtl_panelbig_reflect.JPG differ