moving warpzone shaders to effects_warpzone part II

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 3a73b7f5282dc85fdf8632587dfda9dc60056756..d091201243f08efff7e82bd2e23e7cc531bc1078 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -22871,7 +22871,7 @@ exx/trim/trim_01
 // brush 0
 {
 ( 1312 176 96 ) ( 1312 144 96 ) ( 1120 176 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
 ( 1280 176 128 ) ( 1280 176 -32 ) ( 1280 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1312 144 -32 ) ( 1120 176 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1120 144 128 ) ( 1312 144 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -22886,7 +22886,7 @@ exx/trim/trim_01
 // brush 0
 {
 ( -560 160 144 ) ( -528 288 144 ) ( -528 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
 ( -560 288 144 ) ( -528 288 16 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 16 ) ( -528 160 16 ) ( -528 288 16 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -528 288 16 ) ( -528 160 144 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0

diff --git a/models/warpzone/warpzone-blueedge.md3 b/models/warpzone/warpzone-blueedge.md3
index b0daad14f05b47533d0e3bc4770f4c9a9f5ea857..ab8cbcdd40e72822bbec90cfd5b6e7a5de715a8f 100644 (file)
Binary files a/models/warpzone/warpzone-blueedge.md3 and b/models/warpzone/warpzone-blueedge.md3 differ

diff --git a/models/warpzone/warpzone-rededge.md3 b/models/warpzone/warpzone-rededge.md3
index d6f6c1bcb286e62866e58bcf495bb767f36aad22..bdd656a967deda0492d361c578d628747889cc2e 100644 (file)
Binary files a/models/warpzone/warpzone-rededge.md3 and b/models/warpzone/warpzone-rededge.md3 differ

diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index 81761ec18df57bce03c5c86a2dd8041e3c7aa8d8..ed896e1e5955b6727c8ba09ac2ba86ae3dbff3f4 100644 (file)
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -1,11 +1,11 @@
-textures/warpzone/warpzone-wavy
+textures/effects_warpzone/wavy
 {
        surfaceparm nolightmap
        // surfaceparm nonsolid // no, it must be solid like trigger
        surfaceparm trans
        surfaceparm nomarks
        {
-               map textures/warpzone/warpzone-wavy.tga
+               map textures/effects_warpzone/wavy.tga
                tcMod scroll 0.06 0.06
                blendfunc blend
        }
@@ -13,26 +13,26 @@ textures/warpzone/warpzone-wavy
        dp_refract 1 1 1 1 // makes the camera render like a refraction
 }
 
-textures/warpzone/warpzone-blueedge
+textures/effects_warpzone/blueedge
 {
        surfaceparm nonsolid
        surfaceparm nomarks
        q3map_surfacelight 2500
        cull none
        {
-               map textures/warpzone/warpzone-blueedge.tga
+               map textures/effects_warpzone/blueedge.tga
                blendfunc add
        }
 }
 
-textures/warpzone/warpzone-rededge
+textures/effects_warpzone/rededge
 {
        surfaceparm nonsolid
        surfaceparm nomarks
        q3map_surfacelight 2500
        cull none
        {
-               map textures/warpzone/warpzone-rededge.tga
+               map textures/effects_warpzone/rededge.tga
                blendfunc add
        }
 }

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index d125784a38b2ed4820e186be9de489f451a5dd9e..1b2567298eb4da830297c33bf7cff6fdb7defb04 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -148,8 +148,8 @@ use_texture()
                                        ;;
                        esac
                        ;;
-               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, warpzone
-               textures/decals/*|textures/liquids_*/*|textures/warpzone/*|textures/effects_*/*)
+               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava
+               textures/decals/*|textures/liquids_*/*|textures/effects_*/*)
                        pre=`echo "$1" | cut -d / -f 1-2`
                        case "$2" in
                                "$pre"/*)