projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e2db5d)
some shader fixes again
authorRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 11:15:37 +0000 (13:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 11:15:37 +0000 (13:15 +0200)
scripts/liquids_slime.shader patch | blob | history
scripts/map_newtonian-nightmare.shader patch | blob | history
scripts/map_stormkeep.shader patch | blob | history
scripts/metaltechx.shader patch | blob | history
scripts/model_tree.shader patch | blob | history
scripts/stein1x.shader patch | blob | history

diff --git a/scripts/liquids_slime.shader b/scripts/liquids_slime.shader
index ca54ddd..4b1c1f2 100644 (file)
--- a/scripts/liquids_slime.shader
+++ b/scripts/liquids_slime.shader
@@ -41,6 +41,7 @@ textures/liquids_slime/gelslime-purple
        qer_editorimage textures/liquids_slime/gelslime-purple.tga
        q3map_lightimage textures/liquids_slime/gelslime-purple.tga
        qer_trans 20
        qer_editorimage textures/liquids_slime/gelslime-purple.tga
        q3map_lightimage textures/liquids_slime/gelslime-purple.tga
        qer_trans 20
+       dpoffsetmapping - 1 match8 107
        surfaceparm noimpact
        surfaceparm trans
        surfaceparm nonsolid
        surfaceparm noimpact
        surfaceparm trans
        surfaceparm nonsolid
@@ -67,7 +68,10 @@ textures/liquids_slime/gelslime-purple
 }
 textures/liquids_slime/gelslime-purple_cubemap
 {
 }
 textures/liquids_slime/gelslime-purple_cubemap
 {
+       qer_editorimage textures/liquids_slime/gelslime-purple.tga
+       q3map_lightimage textures/liquids_slime/gelslime-purple.tga
        qer_trans 20
        qer_trans 20
+       dpoffsetmapping - 1 match8 107
        surfaceparm noimpact
        surfaceparm trans
        surfaceparm nonsolid
        surfaceparm noimpact
        surfaceparm trans
        surfaceparm nonsolid
diff --git a/scripts/map_newtonian-nightmare.shader b/scripts/map_newtonian-nightmare.shader
index babeacb..2fab194 100644 (file)
--- a/scripts/map_newtonian-nightmare.shader
+++ b/scripts/map_newtonian-nightmare.shader
@@ -5,7 +5,7 @@ textures/map_newtonian-nightmare/trimlight_blue_s
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_blue.tga
        
        q3map_bounceScale  0.5
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_blue.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 84
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -27,7 +27,7 @@ textures/map_newtonian-nightmare/trimlight_red_s
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_red.tga
        
        q3map_bounceScale  0.5
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_red.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 84
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -49,7 +49,7 @@ textures/map_newtonian-nightmare/trimlight_green_s
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_green.tga
        
        q3map_bounceScale  0.5
        qer_editorimage textures/map_newtonian-nightmare/trims/trimlight_green.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 84
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -105,4 +105,4 @@ textures/map_newtonian-nightmare/screen_offline
                blendFunc blend
                rgbgen identity
        }
                blendFunc blend
                rgbgen identity
        }
-}
\ No newline at end of file
+}
diff --git a/scripts/map_stormkeep.shader b/scripts/map_stormkeep.shader
index 9949381..f82aec1 100644 (file)
--- a/scripts/map_stormkeep.shader
+++ b/scripts/map_stormkeep.shader
@@ -3,6 +3,7 @@ textures/map_stormkeep/rock
        qer_editorimage textures/map_stormkeep/rock
        q3map_nonplanar
        q3map_shadeAngle 150
        qer_editorimage textures/map_stormkeep/rock
        q3map_nonplanar
        q3map_shadeAngle 150
+       dpoffsetmapping - 1 match8 102
        {
                map textures/map_stormkeep/rock
        }
        {
                map textures/map_stormkeep/rock
        }
diff --git a/scripts/metaltechx.shader b/scripts/metaltechx.shader
index ddbc159..a8273de 100644 (file)
--- a/scripts/metaltechx.shader
+++ b/scripts/metaltechx.shader
@@ -1,7 +1,7 @@
 textures/metaltechx/detail-grate
 {
        qer_editorimage textures/metaltechx/detail/grate
 textures/metaltechx/detail-grate
 {
        qer_editorimage textures/metaltechx/detail/grate
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 153
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
@@ -24,7 +24,7 @@ textures/metaltechx/detail-grate
 textures/metaltechx/detail-wires
 {
        qer_editorimage textures/metaltechx/detail/wires
 textures/metaltechx/detail-wires
 {
        qer_editorimage textures/metaltechx/detail/wires
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 170
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
@@ -48,7 +48,7 @@ textures/metaltechx/detail-wires
 textures/metaltechx/wall-aluyellow
 {
        qer_editorimage textures/metaltechx/wall/aluyellow
 textures/metaltechx/wall-aluyellow
 {
        qer_editorimage textures/metaltechx/wall/aluyellow
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 86
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
@@ -72,7 +72,7 @@ textures/metaltechx/wall-aluyellow
 textures/metaltechx/wall-alu
 {
        qer_editorimage textures/metaltechx/wall/alu
 textures/metaltechx/wall-alu
 {
        qer_editorimage textures/metaltechx/wall/alu
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 169
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
@@ -96,7 +96,7 @@ textures/metaltechx/wall-alu
 textures/metaltechx/wall-alu_cap
 {
        qer_editorimage textures/metaltechx/wall/alu_cap
 textures/metaltechx/wall-alu_cap
 {
        qer_editorimage textures/metaltechx/wall/alu_cap
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 147
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
@@ -120,7 +120,7 @@ textures/metaltechx/wall-alu_cap
 textures/metaltechx/wall-alu_base
 {
        qer_editorimage textures/metaltechx/wall/alu_base
 textures/metaltechx/wall-alu_base
 {
        qer_editorimage textures/metaltechx/wall/alu_base
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 163
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm metalsteps
diff --git a/scripts/model_tree.shader b/scripts/model_tree.shader
index 05f9e97..5aff9ff 100644 (file)
--- a/scripts/model_tree.shader
+++ b/scripts/model_tree.shader
@@ -39,6 +39,7 @@ models/leaves7
 cull none
        qer_editorimage models/leaves7.tga
        qer_trans 0.6
 cull none
        qer_editorimage models/leaves7.tga
        qer_trans 0.6
+       dpoffsetmapping - 1 match8 111
        deformVertexes autosprite
        surfaceparm nolightmap
        surfaceparm trans
        deformVertexes autosprite
        surfaceparm nolightmap
        surfaceparm trans
diff --git a/scripts/stein1x.shader b/scripts/stein1x.shader
index 9fad889..321dc4a 100644 (file)
--- a/scripts/stein1x.shader
+++ b/scripts/stein1x.shader
@@ -22,7 +22,7 @@ textures/stein1x/base-cement01
 textures/stein1x/base-cracks
 {
        qer_editorimage textures/stein1x/base/base_cracks.tga
 textures/stein1x/base-cracks
 {
        qer_editorimage textures/stein1x/base/base_cracks.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 193
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -43,7 +43,7 @@ textures/stein1x/base-cracks
 textures/stein1x/base-crete01
 {
        qer_editorimage textures/stein1x/base/base_crete01.tga
 textures/stein1x/base-crete01
 {
        qer_editorimage textures/stein1x/base/base_crete01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 202
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -64,7 +64,7 @@ textures/stein1x/base-crete01
 textures/stein1x/base-crete02
 {
        qer_editorimage textures/stein1x/base/base_crete02.tga
 textures/stein1x/base-crete02
 {
        qer_editorimage textures/stein1x/base/base_crete02.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 194
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -108,7 +108,7 @@ textures/stein1x/base-marble
 textures/stein1x/base-misc01
 {
        qer_editorimage textures/stein1x/base/base_misc01.tga
 textures/stein1x/base-misc01
 {
        qer_editorimage textures/stein1x/base/base_misc01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 193
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -130,7 +130,7 @@ textures/stein1x/base-misc01
 textures/stein1x/floor-tile01
 {
        qer_editorimage textures/stein1x/floor/floor_tile01.tga
 textures/stein1x/floor-tile01
 {
        qer_editorimage textures/stein1x/floor/floor_tile01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 190
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -152,7 +152,7 @@ textures/stein1x/floor-tile01
 textures/stein1x/misc-fan01
 {
        qer_editorimage textures/stein1x/misc/misc_fan01.tga
 textures/stein1x/misc-fan01
 {
        qer_editorimage textures/stein1x/misc/misc_fan01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 98
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -173,7 +173,7 @@ textures/stein1x/misc-fan01
 textures/stein1x/terrain-mossystone01
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone01.tga
 textures/stein1x/terrain-mossystone01
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 191
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
@@ -195,7 +195,7 @@ textures/stein1x/terrain-mossystone01
 textures/stein1x/terrain-mossystone02
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone02.tga
 textures/stein1x/terrain-mossystone02
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone02.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 190
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
@@ -217,7 +217,7 @@ textures/stein1x/terrain-mossystone02
 textures/stein1x/terrain-mossystone03
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone03.tga
 textures/stein1x/terrain-mossystone03
 {
        qer_editorimage textures/stein1x/terrain/terrain_mossystone03.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 189
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
        dpglossintensitymod  3
        dpglossexponentmod  4
        surfaceparm dust
@@ -239,7 +239,7 @@ textures/stein1x/terrain-mossystone03
 textures/stein1x/trim-cement01
 {
        qer_editorimage textures/stein1x/trim/trim_cement01.tga
 textures/stein1x/trim-cement01
 {
        qer_editorimage textures/stein1x/trim/trim_cement01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 193
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -260,7 +260,7 @@ textures/stein1x/trim-cement01
 textures/stein1x/trim-peeling01
 {
        qer_editorimage textures/stein1x/trim/trim_peeling01.tga
 textures/stein1x/trim-peeling01
 {
        qer_editorimage textures/stein1x/trim/trim_peeling01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 191
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -282,7 +282,7 @@ textures/stein1x/trim-peeling01
 textures/stein1x/wall-cement01
 {
        qer_editorimage textures/stein1x/wall/wall_cement01.tga
 textures/stein1x/wall-cement01
 {
        qer_editorimage textures/stein1x/wall/wall_cement01.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 193
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -304,7 +304,7 @@ textures/stein1x/wall-cement01
 textures/stein1x/wall-cement02
 {
        qer_editorimage textures/stein1x/wall/wall_cement02.tga
 textures/stein1x/wall-cement02
 {
        qer_editorimage textures/stein1x/wall/wall_cement02.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 192
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
@@ -326,7 +326,7 @@ textures/stein1x/wall-cement02
 textures/stein1x/wall-cement03
 {
        qer_editorimage textures/stein1x/wall/wall_cement03.tga
 textures/stein1x/wall-cement03
 {
        qer_editorimage textures/stein1x/wall/wall_cement03.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 192
        dpglossintensitymod  3
        dpglossexponentmod  4
 
        dpglossintensitymod  3
        dpglossexponentmod  4
 
@@ -347,7 +347,7 @@ textures/stein1x/wall-cement03
 textures/stein1x/wall-cement04
 {
        qer_editorimage textures/stein1x/wall/wall_cement04.tga
 textures/stein1x/wall-cement04
 {
        qer_editorimage textures/stein1x/wall/wall_cement04.tga
-       dpoffsetmapping - 2
+       dpoffsetmapping - 2 match8 193
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bounceScale 1.25