From: MirceaKitsune Date: Sat, 28 Jan 2012 20:06:50 +0000 (+0200) Subject: Merge two shaders which I don't understand why were separate at all X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=450bd6910b4a02fee2735019ebb958093844f2cf;p=voretournament%2Fvoretournament.git Merge two shaders which I don't understand why were separate at all --- diff --git a/data/scripts/e8.shader b/data/scripts/e8.shader index 77a79d10..fbf7e9ea 100644 --- a/data/scripts/e8.shader +++ b/data/scripts/e8.shader @@ -2,14 +2,23 @@ textures/e8/e8_launchpad1 { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8_launchpad1 + q3map_surfacelight 100 + { + map textures/e8/e8_launchpad1_fx.tga + rgbGen identity + tcMod scroll 0 3 + } + { + map textures/e8/e8_launchpad1.tga + blendfunc blend + rgbGen identity } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO + blendfunc gl_dst_color gl_one_minus_dst_alpha rgbGen identity - } + tcGen lightmap + } } textures/e8/e8bolttrim @@ -86,14 +95,22 @@ textures/e8/e8rail2 { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8rail2 + surfaceparm alphashadow + cull disable + nomipmaps + { + map textures/e8/e8rail2.tga + rgbGen identity + depthWrite + alphaFunc GE128 } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO + blendfunc filter rgbGen identity - } + tcGen lightmap + depthFunc equal + } } textures/e8/e8tinylightblue @@ -114,28 +131,40 @@ textures/e8/e8trimlight { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8trimlight - } + q3map_lightimage textures/e8/e8trimlight_fx.tga + q3map_surfacelight 100 { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO rgbGen identity - } + tcGen lightmap + } + { + map textures/e8/e8trimlight.tga + blendfunc filter + rgbGen identity + } + { + map textures/e8/e8trimlight_fx.tga + blendfunc add + tcMod scroll -2 0 + } } textures/e8/e8trimlight2 { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8trimlight2 + qer_editorimage textures/e8/e8trimlight2.tga + surfaceparm nomarks + q3map_surfacelight 400 + { + map textures/e8/e8trimlight2.tga } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO - rgbGen identity - } + blendfunc filter + tcGen lightmap + } } textures/e8/e8warning2 @@ -155,43 +184,65 @@ textures/e8/e8warning2 textures/e8/e8xgirder { dpreflectcube cubemaps/exomorph/exomorph + surfaceparm alphashadow surfaceparm metalsteps - { - map textures/e8/e8xgirder + surfaceparm nomarks + surfaceparm trans + cull disable + nopicmip + { + map textures/e8/e8xgirder.tga + rgbGen identity + depthWrite + alphaFunc GE128 } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO + blendfunc filter rgbGen identity - } + tcGen lightmap + depthFunc equal + } } textures/e8/e8xgirder_small { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8xgirder_small + cull disable + { + map textures/e8/e8xgirder_small.tga + rgbGen identity + depthWrite + alphaFunc GE128 } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO + blendfunc filter rgbGen identity - } + tcGen lightmap + depthFunc equal + } } textures/e8/e8xgirder_small2 { dpreflectcube cubemaps/exomorph/exomorph surfaceparm metalsteps - { - map textures/e8/e8xgirder_small2 + cull disable + { + map textures/e8/e8xgirder_small2.tga + rgbGen identity + depthWrite + alphaFunc GE128 } { map $lightmap - blendfunc GL_DST_COLOR GL_ZERO + blendfunc filter rgbGen identity - } + tcGen lightmap + depthFunc equal + } } textures/e8/e8jumpspawn02b @@ -240,4 +291,248 @@ textures/e8/e8_base1broke map textures/e8/e8_base1broke rgbGen vertex } -} \ No newline at end of file +} + +textures/e8/e8alphaspawn +{ + surfaceparm nomarks + surfaceparm trans + surfaceparm pointlight + { + map textures/e8/e8alphaspawn.tga + blendfunc add + rgbGen Vertex + } +} + +textures/e8/e8yarrow +{ + surfaceparm nomarks + surfaceparm trans + surfaceparm pointlight + { + map textures/e8/e8yarrow.tga + blendfunc add + rgbGen Vertex + } +} + +textures/e8/e8lightblue_flicker +{ + qer_editorimage textures/e8/e8tinylightblue.tga + surfaceparm nomarks + q3map_surfacelight 950 + { + map textures/e8/e8tinylightblue.tga + } + { + map $lightmap + blendfunc filter + tcGen lightmap + } +} + +textures/e8/zap_e8 +{ + qer_editorimage textures/sfx/zap_scroll.tga + //q3map_surfacelight 300 + surfaceparm trans + surfaceparm nomarks + surfaceparm nolightmap + cull none + { + Map textures/sfx/zap_scroll.tga + blendFunc GL_ONE GL_ONE + rgbgen wave triangle .8 2 0 7 + tcMod scroll 0 1 + } + { + Map textures/sfx/zap_scroll.tga + blendFunc GL_ONE GL_ONE + rgbgen wave triangle 1 1.4 0 5 + tcMod scale -1 1 + tcMod scroll 0 1 + } + { + Map textures/sfx/zap_scroll2.tga + blendFunc GL_ONE GL_ONE + rgbgen wave triangle 1 1.4 0 6.3 + tcMod scale -1 1 + tcMod scroll 2 1 + } + { + Map textures/sfx/zap_scroll2.tga + blendFunc GL_ONE GL_ONE + rgbgen wave triangle 1 1.4 0 7.7 + tcMod scroll -1.3 1 + } +} + +textures/e8/e8lighttrim_static +{ + qer_editorimage textures/e8/e8lighttrim.tga + surfaceparm nomarks + q3map_surfacelight 400 + { + map textures/e8/e8lighttrim.tga + } + { + map $lightmap + blendfunc filter + tcGen lightmap + } +} + +textures/e8/e8lighttrim_glow +{ + qer_editorimage textures/e8/e8lighttrim.tga + surfaceparm nomarks + q3map_surfacelight 400 + { + map textures/e8/e8lighttrim.tga + } + { + map $lightmap + blendfunc filter + tcGen lightmap + } +} + +textures/e8/e8lighttrim_b_static +{ + qer_editorimage textures/e8/e8lighttrim_b.tga + surfaceparm nomarks + q3map_surfacelight 400 + { + map textures/e8/e8lighttrim_b.tga + } + { + map $lightmap + blendfunc filter + tcGen lightmap + } + } + +textures/e8/e8lighttrim_b_glow +{ + qer_editorimage textures/e8/e8lighttrim_b.tga + surfaceparm nomarks + q3map_surfacelight 400 + { + map textures/e8/e8lighttrim_b.tga + } + { + map $lightmap + blendfunc filter + tcGen lightmap + } +} + +textures/e8/e8evilspacetxt +{ + surfaceparm nomarks + surfaceparm trans + surfaceparm pointlight + { + map textures/e8/e8evilspacetxt.tga + blendfunc add + rgbGen Vertex + } +} + +textures/e8/e8beam_blue +{ + qer_editorimage textures/e8/e8beam_blue.tga + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm nonsolid + surfaceparm trans + cull disable + qer_trans 0.6 + { + map textures/e8/e8beam_blue.tga + blendfunc add + tcMod scroll 0.3 0 + } +} + +textures/e8/e8metal03c_shiney +{ + qer_editorimage textures/e8/e8metal03c.tga + { + map textures/effects/tinfx.tga + rgbGen identity + tcGen environment + } + { + map $lightmap + blendfunc gl_dst_color gl_one_minus_dst_alpha + rgbGen identity + tcGen lightmap + } +} + +textures/e8/ctf_e8stars +{ + qer_editorimage textures/e8/e8stars.tga + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + q3map_surfacelight 10 + q3map_sun 1 0.98 0.9 15 0 90 + skyParms textures/e8/env/e8 - - +} + +textures/e8/dm_e8stars +{ + qer_editorimage textures/e8/e8stars.tga + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + q3map_surfacelight 30 + q3map_sun 1 0.98 0.9 55 0 90 + skyParms textures/e8/env/e8 - - +} + +textures/e8/dm_e8stars2 +{ + qer_editorimage textures/e8/e8stars.tga + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + q3map_surfacelight 70 + q3map_sun 1 0.98 0.9 100 0 90 + skyParms textures/e8/env/e8 - - +} + +textures/e8/e8metal_blue_shiney +{ + qer_editorimage textures/e8/e8metal_blue.tga + { + map textures/effects/tinfx.tga + rgbGen identity + tcGen environment + } + { + map $lightmap + blendfunc gl_dst_color gl_one_minus_dst_alpha + rgbGen identity + tcGen lightmap + } +} + +textures/e8/e8metal_red_shiney +{ + qer_editorimage textures/e8/e8metal_red.tga + { + map textures/effects/tinfx.tga + rgbGen identity + tcGen environment + } + { + map $lightmap + blendfunc gl_dst_color gl_one_minus_dst_alpha + rgbGen identity + tcGen lightmap + } +} diff --git a/data/scripts/el3dm1.shader b/data/scripts/el3dm1.shader deleted file mode 100644 index 4456a9f8..00000000 --- a/data/scripts/el3dm1.shader +++ /dev/null @@ -1,385 +0,0 @@ -textures/e8/e8alphaspawn -{ - surfaceparm nomarks - surfaceparm trans - surfaceparm pointlight - { - map textures/e8/e8alphaspawn.tga - blendfunc add - rgbGen Vertex - } -} - -textures/e8/e8yarrow -{ - surfaceparm nomarks - surfaceparm trans - surfaceparm pointlight - { - map textures/e8/e8yarrow.tga - blendfunc add - rgbGen Vertex - } -} - -textures/e8/e8lightblue_flicker -{ - qer_editorimage textures/e8/e8tinylightblue.tga - surfaceparm nomarks - q3map_surfacelight 950 - { - map textures/e8/e8tinylightblue.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } -} - -//id shader modified.. - -textures/e8/zap_e8 -{ - qer_editorimage textures/sfx/zap_scroll.tga -//q3map_surfacelight 300 - surfaceparm trans - surfaceparm nomarks - surfaceparm nolightmap - cull none - { - Map textures/sfx/zap_scroll.tga - blendFunc GL_ONE GL_ONE - rgbgen wave triangle .8 2 0 7 - tcMod scroll 0 1 - } - { - Map textures/sfx/zap_scroll.tga - blendFunc GL_ONE GL_ONE - rgbgen wave triangle 1 1.4 0 5 - tcMod scale -1 1 - tcMod scroll 0 1 - } - { - Map textures/sfx/zap_scroll2.tga - blendFunc GL_ONE GL_ONE - rgbgen wave triangle 1 1.4 0 6.3 - tcMod scale -1 1 - tcMod scroll 2 1 - } - { - Map textures/sfx/zap_scroll2.tga - blendFunc GL_ONE GL_ONE - rgbgen wave triangle 1 1.4 0 7.7 - tcMod scroll -1.3 1 - } -} -//end id shader modify - -textures/e8/e8lighttrim_static -{ - qer_editorimage textures/e8/e8lighttrim.tga - surfaceparm nomarks - q3map_surfacelight 400 - { - map textures/e8/e8lighttrim.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } -} - -textures/e8/e8lighttrim_glow -{ - qer_editorimage textures/e8/e8lighttrim.tga - surfaceparm nomarks - q3map_surfacelight 400 - { - map textures/e8/e8lighttrim.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } -} - -textures/e8/e8lighttrim_b_static -{ - qer_editorimage textures/e8/e8lighttrim_b.tga - surfaceparm nomarks - q3map_surfacelight 400 - { - map textures/e8/e8lighttrim_b.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } - } - -textures/e8/e8lighttrim_b_glow -{ - qer_editorimage textures/e8/e8lighttrim_b.tga - surfaceparm nomarks - q3map_surfacelight 400 - { - map textures/e8/e8lighttrim_b.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } -} - -textures/e8/e8_launchpad1 -{ - surfaceparm metalsteps - q3map_surfacelight 100 - { - map textures/e8/e8_launchpad1_fx.tga - rgbGen identity - tcMod scroll 0 3 - } - { - map textures/e8/e8_launchpad1.tga - blendfunc blend - rgbGen identity - } - { - map $lightmap - blendfunc gl_dst_color gl_one_minus_dst_alpha - rgbGen identity - tcGen lightmap - } -} - -textures/e8/e8xgirder -{ - surfaceparm alphashadow - surfaceparm metalsteps - surfaceparm nomarks - surfaceparm trans - cull disable - nopicmip - { - map textures/e8/e8xgirder.tga - rgbGen identity - depthWrite - alphaFunc GE128 - } - { - map $lightmap - blendfunc filter - rgbGen identity - tcGen lightmap - depthFunc equal - } -} - -textures/e8/e8xgirder_small -{ - cull disable - { - map textures/e8/e8xgirder_small.tga - rgbGen identity - depthWrite - alphaFunc GE128 - } - { - map $lightmap - blendfunc filter - rgbGen identity - tcGen lightmap - depthFunc equal - } -} - -textures/e8/e8xgirder_small2 -{ - cull disable - { - map textures/e8/e8xgirder_small2.tga - rgbGen identity - depthWrite - alphaFunc GE128 - } - { - map $lightmap - blendfunc filter - rgbGen identity - tcGen lightmap - depthFunc equal - } -} - -textures/e8/e8rail2 -{ - surfaceparm alphashadow - cull disable - nomipmaps - { - map textures/e8/e8rail2.tga - rgbGen identity - depthWrite - alphaFunc GE128 - } - { - map $lightmap - blendfunc filter - rgbGen identity - tcGen lightmap - depthFunc equal - } -} - -textures/e8/e8evilspacetxt -{ - surfaceparm nomarks - surfaceparm trans - surfaceparm pointlight - { - map textures/e8/e8evilspacetxt.tga - blendfunc add - rgbGen Vertex - } -} - -textures/e8/e8beam_blue -{ - qer_editorimage textures/e8/e8beam_blue.tga - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm nonsolid - surfaceparm trans - cull disable - qer_trans 0.6 - { - map textures/e8/e8beam_blue.tga - blendfunc add - tcMod scroll 0.3 0 - } -} - -textures/e8/e8metal03c_shiney -{ - qer_editorimage textures/e8/e8metal03c.tga - { - map textures/effects/tinfx.tga - rgbGen identity - tcGen environment - } - { - map $lightmap - blendfunc gl_dst_color gl_one_minus_dst_alpha - rgbGen identity - tcGen lightmap - } -} - -textures/e8/ctf_e8stars -{ - qer_editorimage textures/e8/e8stars.tga - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - q3map_surfacelight 10 - q3map_sun 1 0.98 0.9 15 0 90 - skyParms textures/e8/env/e8 - - -} - -textures/e8/dm_e8stars -{ - qer_editorimage textures/e8/e8stars.tga - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - q3map_surfacelight 30 - q3map_sun 1 0.98 0.9 55 0 90 - skyParms textures/e8/env/e8 - - -} - -textures/e8/dm_e8stars2 -{ - qer_editorimage textures/e8/e8stars.tga - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - q3map_surfacelight 70 - q3map_sun 1 0.98 0.9 100 0 90 - skyParms textures/e8/env/e8 - - -} - -textures/e8/e8metal_blue_shiney -{ - qer_editorimage textures/e8/e8metal_blue.tga - { - map textures/effects/tinfx.tga - rgbGen identity - tcGen environment - } - { - map $lightmap - blendfunc gl_dst_color gl_one_minus_dst_alpha - rgbGen identity - tcGen lightmap - } -} - -textures/e8/e8metal_red_shiney -{ - qer_editorimage textures/e8/e8metal_red.tga - { - map textures/effects/tinfx.tga - rgbGen identity - tcGen environment - } - { - map $lightmap - blendfunc gl_dst_color gl_one_minus_dst_alpha - rgbGen identity - tcGen lightmap - } -} - -//broken shader D: - -textures/e8/e8trimlight -{ - q3map_lightimage textures/e8/e8trimlight_fx.tga - q3map_surfacelight 100 - { - map $lightmap - rgbGen identity - tcGen lightmap - } - { - map textures/e8/e8trimlight.tga - blendfunc filter - rgbGen identity - } - { - map textures/e8/e8trimlight_fx.tga - blendfunc add - tcMod scroll -2 0 - } -} - -textures/e8/e8trimlight2 -{ - qer_editorimage textures/e8/e8trimlight2.tga - surfaceparm nomarks - q3map_surfacelight 400 - { - map textures/e8/e8trimlight2.tga - } - { - map $lightmap - blendfunc filter - tcGen lightmap - } -} diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt index 51ca259f..6b542c33 100644 --- a/data/scripts/shaderlist.txt +++ b/data/scripts/shaderlist.txt @@ -7,8 +7,8 @@ desertfactory domination dsi e7 +e8 egyptsoc -el3dm1 evil_basemetal evil_basewall evil_d_techwalls