From 95b2dc69a13554760e70741bc0ef5f812cfec35c Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Wed, 3 Nov 2010 18:30:50 +0200 Subject: [PATCH] Lastly, move the gradient light texture in effects_lightning. I think many maps can use it, and it doesn't make sense to keep this effect map specific imo. Please check if it's placed correctly like this. --- maps/red-planet.map | 32 +++++++++--------- scripts/effects_lightning.shader | 13 +++++++ scripts/map_red-planet.shader | 13 ------- .../gradient/gradient_white.tga} | Bin 4 files changed, 29 insertions(+), 29 deletions(-) rename textures/{map_red-planet/gradient_light.tga => effects_lightning/gradient/gradient_white.tga} (100%) diff --git a/maps/red-planet.map b/maps/red-planet.map index 3f9bb140..a553db03 100644 --- a/maps/red-planet.map +++ b/maps/red-planet.map @@ -6373,11 +6373,11 @@ exx/trim-psimple04 // brush 676 { ( -544 -288 280 ) ( -544 -352 280 ) ( -568 -352 256 ) common/nodraw -0 0 0 0.5 0.5 134217728 0 0 -( -408 -224 208 ) ( -544 -352 280 ) ( -544 -288 280 ) map_red-planet/gradient_light 0 511.7046508789 90 0.2656300068 0.2656300068 134217728 0 0 +( -408 -224 208 ) ( -544 -352 280 ) ( -544 -288 280 ) effects_lightning/gradient/gradient_white 0 511.7046508789 90 0.2656300068 0.2656300068 134217728 0 0 ( -408 -416 208 ) ( -496 -224 120 ) ( -496 -416 120 ) common/nodraw -0 0 0 0.5 0.5 134217728 0 0 -( -408 -416 208 ) ( -568 -352 256 ) ( -544 -352 280 ) map_red-planet/gradient_light 354.5358276367 492.376159668 45 0.2872599959 0.2872599959 134217728 0 0 -( -496 -416 120 ) ( -568 -288 256 ) ( -568 -352 256 ) map_red-planet/gradient_light 0 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 -( -496 -224 120 ) ( -544 -288 280 ) ( -568 -288 256 ) map_red-planet/gradient_light 354.5358276367 492.3776245117 45 0.2872599959 0.2872599959 134217728 0 0 +( -408 -416 208 ) ( -568 -352 256 ) ( -544 -352 280 ) effects_lightning/gradient/gradient_white 354.5358276367 492.376159668 45 0.2872599959 0.2872599959 134217728 0 0 +( -496 -416 120 ) ( -568 -288 256 ) ( -568 -352 256 ) effects_lightning/gradient/gradient_white 0 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 +( -496 -224 120 ) ( -544 -288 280 ) ( -568 -288 256 ) effects_lightning/gradient/gradient_white 354.5358276367 492.3776245117 45 0.2872599959 0.2872599959 134217728 0 0 } // brush 677 { @@ -6392,11 +6392,11 @@ exx/trim-psimple04 // brush 678 { ( -544 352 280 ) ( -544 288 280 ) ( -568 288 256 ) common/nodraw -0 0 0 0.5 0.5 134217728 0 0 -( -408 416 208 ) ( -544 288 280 ) ( -544 352 280 ) map_red-planet/gradient_light 150.6337890625 511.7046508789 90 0.2656300068 0.2656300068 134217728 0 0 +( -408 416 208 ) ( -544 288 280 ) ( -544 352 280 ) effects_lightning/gradient/gradient_white 150.6337890625 511.7046508789 90 0.2656300068 0.2656300068 134217728 0 0 ( -408 224 208 ) ( -496 416 120 ) ( -496 224 120 ) common/nodraw -0 0 0 0.5 0.5 134217728 0 0 -( -408 224 208 ) ( -568 288 256 ) ( -544 288 280 ) map_red-planet/gradient_light 354.5358276367 492.376159668 45 0.2872599959 0.2872599959 134217728 0 0 -( -496 224 120 ) ( -568 352 256 ) ( -568 288 256 ) map_red-planet/gradient_light 150.6337890625 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 -( -496 416 120 ) ( -544 352 280 ) ( -568 352 256 ) map_red-planet/gradient_light 354.5358276367 492.3776245117 45 0.2872599959 0.2872599959 134217728 0 0 +( -408 224 208 ) ( -568 288 256 ) ( -544 288 280 ) effects_lightning/gradient/gradient_white 354.5358276367 492.376159668 45 0.2872599959 0.2872599959 134217728 0 0 +( -496 224 120 ) ( -568 352 256 ) ( -568 288 256 ) effects_lightning/gradient/gradient_white 150.6337890625 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 +( -496 416 120 ) ( -544 352 280 ) ( -568 352 256 ) effects_lightning/gradient/gradient_white 354.5358276367 492.3776245117 45 0.2872599959 0.2872599959 134217728 0 0 } // brush 679 { @@ -6421,20 +6421,20 @@ exx/trim-psimple04 // brush 681 { ( 568 -352 256 ) ( 544 -352 280 ) ( 544 -288 280 ) common/nodraw 0 0 0 -0.5 0.5 134217728 0 0 -( 544 -288 280 ) ( 544 -352 280 ) ( 408 -224 208 ) map_red-planet/gradient_light 0 511.7045288086 90 0.2656300068 -0.2656300068 134217728 0 0 +( 544 -288 280 ) ( 544 -352 280 ) ( 408 -224 208 ) effects_lightning/gradient/gradient_white 0 511.7045288086 90 0.2656300068 -0.2656300068 134217728 0 0 ( 496 -416 120 ) ( 496 -224 120 ) ( 408 -416 208 ) common/nodraw 0 0 0 -0.5 0.5 134217728 0 0 -( 544 -352 280 ) ( 568 -352 256 ) ( 408 -416 208 ) map_red-planet/gradient_light 354.5369262695 492.3767700195 135 0.2872599959 -0.2872599959 134217728 0 0 -( 568 -352 256 ) ( 568 -288 256 ) ( 496 -416 120 ) map_red-planet/gradient_light 0 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 -( 568 -288 256 ) ( 544 -288 280 ) ( 496 -224 120 ) map_red-planet/gradient_light 354.5369262695 492.3787231445 135 0.2872599959 -0.2872599959 134217728 0 0 +( 544 -352 280 ) ( 568 -352 256 ) ( 408 -416 208 ) effects_lightning/gradient/gradient_white 354.5369262695 492.3767700195 135 0.2872599959 -0.2872599959 134217728 0 0 +( 568 -352 256 ) ( 568 -288 256 ) ( 496 -416 120 ) effects_lightning/gradient/gradient_white 0 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 +( 568 -288 256 ) ( 544 -288 280 ) ( 496 -224 120 ) effects_lightning/gradient/gradient_white 354.5369262695 492.3787231445 135 0.2872599959 -0.2872599959 134217728 0 0 } // brush 682 { ( 568 288 256 ) ( 544 288 280 ) ( 544 352 280 ) common/nodraw 0 0 0 -0.5 0.5 134217728 0 0 -( 544 352 280 ) ( 544 288 280 ) ( 408 416 208 ) map_red-planet/gradient_light 150.6337890625 511.7045288086 90 0.2656300068 -0.2656300068 134217728 0 0 +( 544 352 280 ) ( 544 288 280 ) ( 408 416 208 ) effects_lightning/gradient/gradient_white 150.6337890625 511.7045288086 90 0.2656300068 -0.2656300068 134217728 0 0 ( 496 224 120 ) ( 496 416 120 ) ( 408 224 208 ) common/nodraw 0 0 0 -0.5 0.5 134217728 0 0 -( 544 288 280 ) ( 568 288 256 ) ( 408 224 208 ) map_red-planet/gradient_light 354.5369262695 492.3767700195 135 0.2872599959 -0.2872599959 134217728 0 0 -( 568 288 256 ) ( 568 352 256 ) ( 496 224 120 ) map_red-planet/gradient_light 150.6337890625 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 -( 568 352 256 ) ( 544 352 280 ) ( 496 416 120 ) map_red-planet/gradient_light 354.5369262695 492.3787231445 135 0.2872599959 -0.2872599959 134217728 0 0 +( 544 288 280 ) ( 568 288 256 ) ( 408 224 208 ) effects_lightning/gradient/gradient_white 354.5369262695 492.3767700195 135 0.2872599959 -0.2872599959 134217728 0 0 +( 568 288 256 ) ( 568 352 256 ) ( 496 224 120 ) effects_lightning/gradient/gradient_white 150.6337890625 451.7647094727 0 0.2656300068 0.2656300068 134217728 0 0 +( 568 352 256 ) ( 544 352 280 ) ( 496 416 120 ) effects_lightning/gradient/gradient_white 354.5369262695 492.3787231445 135 0.2872599959 -0.2872599959 134217728 0 0 } // brush 683 { diff --git a/scripts/effects_lightning.shader b/scripts/effects_lightning.shader index ff8b487d..2d2bb03b 100644 --- a/scripts/effects_lightning.shader +++ b/scripts/effects_lightning.shader @@ -62,3 +62,16 @@ textures/effects_lightning/lightning1_d blendfunc add } } +//Gradient white +textures/effects_lightning/gradient/gradient_white +{ + qer_editorimage textures/effects_lightning/gradient/gradient_white.tga + surfaceparm noimpact + surfaceparm nonsolid + surfaceparm trans + cull none + { + clampmap textures/effects_lightning/gradient/gradient_white.tga + blendfunc blend + } +} \ No newline at end of file diff --git a/scripts/map_red-planet.shader b/scripts/map_red-planet.shader index 61b5c3f9..20105913 100644 --- a/scripts/map_red-planet.shader +++ b/scripts/map_red-planet.shader @@ -57,16 +57,3 @@ textures/map_red-planet/env3 tcgen lightmap }*/ } - -textures/map_red-planet/gradient_light -{ - qer_editorimage textures/map_red-planet/gradient_light.tga - surfaceparm noimpact - surfaceparm nonsolid - surfaceparm trans - cull none - { - clampmap textures/map_red-planet/gradient_light.tga - blendfunc blend - } -} diff --git a/textures/map_red-planet/gradient_light.tga b/textures/effects_lightning/gradient/gradient_white.tga similarity index 100% rename from textures/map_red-planet/gradient_light.tga rename to textures/effects_lightning/gradient/gradient_white.tga -- 2.39.2