From: mschwan Date: Sun, 20 Sep 2015 19:11:46 +0000 (+0200) Subject: small visual improvements, shader clean-up X-Git-Tag: xonotic-v0.8.2~162^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bb0add0d328d6d8b9727f87a990b26a2e7b7ccc;p=xonotic%2Fxonotic-maps.pk3dir.git small visual improvements, shader clean-up --- diff --git a/maps/warfare.map b/maps/warfare.map index 267b0ca9..df2cdaac 100644 --- a/maps/warfare.map +++ b/maps/warfare.map @@ -32186,10 +32186,11 @@ exx/base-metal05rust } { "classname" "misc_model" -"origin" "-26.000000 133.000000 -20.000000" +"origin" "-507.999939 -1143.000000 57.999908" "model" "models/map_warfare/boulder_1.md3" "modelscale" "0.700000" "spawnflags" "4" +"angles" "-5.922283 -8.308860 17.080246" } { "classname" "misc_model" @@ -32247,10 +32248,11 @@ exx/base-metal05rust } { "classname" "misc_model" -"origin" "-157.000000 -215.000000 -12.000000" +"origin" "-315.000000 -1219.000122 76.000015" "model" "models/map_warfare/small_rocks.md3" "modelscale" "7.000000" "spawnflags" "4" +"angles" "4.682997 0.236063 2.888983" } { "classname" "misc_model" @@ -32361,34 +32363,6 @@ exx/base-metal05rust "spawnflags" "4" } { -"classname" "misc_gamemodel" -"origin" "435.049530 749.831360 122.260620" -"model" "models/map_warfare/cactus.obj" -"modelscale" "1.700000" -"angles" "11.806162 119.315575 10.049067" -} -{ -"classname" "misc_gamemodel" -"origin" "420.221466 -821.656311 472.003845" -"model" "models/map_warfare/cactus.obj" -"modelscale" "1.700000" -"angles" "4.660039 50.702106 2.371722" -} -{ -"classname" "misc_gamemodel" -"origin" "649.648193 -1338.152832 352.140930" -"model" "models/map_warfare/cactus.obj" -"modelscale" "1.800000" -"angles" "-19.621141 -165.325974 -31.031652" -} -{ -"classname" "misc_gamemodel" -"origin" "1180.248657 -817.675537 292.009247" -"model" "models/map_warfare/cactus.obj" -"modelscale" "1.800000" -"angles" "5.276835 47.410706 15.626326" -} -{ "classname" "info_autoscreenshot" "origin" "76.4626083 -1187.55554 541.621399" "angles" "4.22424316 45.2526855 0" @@ -32434,3 +32408,71 @@ exx/base-metal05rust "angles" "-6.289028 137.856934 1.316799" "spawnflags" "4" } +{ +"classname" "misc_model" +"origin" "649.648193 -1338.152832 352.140930" +"model" "models/map_warfare/cactus.obj" +"modelscale" "1.800000" +"angles" "-19.621141 -165.325974 -31.031652" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "1180.248657 -817.675537 292.009247" +"model" "models/map_warfare/cactus.obj" +"modelscale" "1.800000" +"angles" "5.276835 47.410706 15.626326" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "435.049530 749.831360 122.260620" +"model" "models/map_warfare/cactus.obj" +"modelscale" "1.700000" +"angles" "11.806162 119.315575 10.049067" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "420.221466 -821.656311 472.003845" +"model" "models/map_warfare/cactus.obj" +"modelscale" "1.700000" +"angles" "4.660039 50.702106 2.371722" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "1423.000000 591.000061 130.000092" +"model" "models/map_warfare/cactus.obj" +"spawnflags" "4" +"angles" "12.074849 5.873147 -9.703994" +"modelscale_vec" "1.000000 1.000000 1.300000" +} +{ +"classname" "misc_model" +"origin" "-432.000000 -1180.000122 75.000008" +"model" "models/map_warfare/cactus.obj" +"spawnflags" "4" +"angles" "2.804623 95.043098 -9.026549" +} +{ +"classname" "misc_model" +"origin" "-26.000000 133.000000 -20.000000" +"model" "models/map_warfare/boulder_1.md3" +"modelscale" "0.700000" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "-585.000000 -950.000000 69.000000" +"model" "models/map_warfare/boulder_1.md3" +"modelscale" "0.700000" +"spawnflags" "4" +} +{ +"classname" "misc_model" +"origin" "-157.000000 -215.000000 -12.000000" +"model" "models/map_warfare/small_rocks.md3" +"modelscale" "7.000000" +"spawnflags" "4" +} diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader index 492d3d23..fe976b74 100644 --- a/scripts/map_warfare.shader +++ b/scripts/map_warfare.shader @@ -1,108 +1,108 @@ textures/map_warfare/rocktosoil { - qer_editorimage textures/map_warfare/rocktosoil - - dpoffsetmapping - 2 match8 168 - dpglossintensitymod 2 - dpglossexponentmod 4 - - q3map_bouncescale 0.75 - q3map_lightmapsampleoffset 8 - q3map_nonplanar - q3map_shadeangle 90 - q3map_alphamod dotproduct2 ( 0 0 1 ) - { - map textures/phillipk2x/natural/pk02_rock01 - } - { - map textures/phillipk2x/natural/pk02_sand01 - blendfunc blend - alphagen vertex - } - { - map $lightmap - blendfunc GL_DST_COLOR GL_ZERO - } + qer_editorimage textures/map_warfare/rocktosoil + + dpoffsetmapping - 2 match8 168 + dpglossintensitymod 2 + dpglossexponentmod 4 + + q3map_lightmapsampleoffset 8 + q3map_nonplanar + q3map_shadeangle 90 + q3map_alphamod dotproduct2 ( 0 0 1 ) + { + map textures/phillipk2x/natural/pk02_rock01 + } + { + map textures/phillipk2x/natural/pk02_sand01 + blendfunc blend + alphagen vertex + } + { + map $lightmap + blendfunc filter + } } textures/map_warfare/env { - qer_editorimage textures/map_warfare/env.tga - qer_trans 0.5 - - surfaceparm trans - - cull none - { - map textures/map_warfare/env.tga - blendfunc add - tcgen environment - } + qer_editorimage textures/map_warfare/env + qer_trans 0.5 + + surfaceparm trans + + cull none + { + map textures/map_warfare/env + blendfunc add + tcgen environment + } } textures/map_warfare/floor_panel { - qer_editorimage textures/map_warfare/floor_panel - qer_alphafunc qequal 0.5 - + qer_editorimage textures/map_warfare/floor_panel + qer_alphafunc qequal 0.5 + dpoffsetmapping - 2 match8 172 - dpglossintensitymod 3 - dpglossexponentmod 4 - - surfaceparm metalsteps - surfaceparm trans - surfaceparm nonsolid - - q3map_bouncescale 0.75 + dpglossintensitymod 3 + dpglossexponentmod 4 + + surfaceparm metalsteps + surfaceparm trans + surfaceparm nonsolid + + q3map_bouncescale 0.75 polygonoffset - { - map textures/map_warfare/floor_panel - alphaFunc GT0 - } - { - map $lightmap - blendfunc filter - } + { + map textures/map_warfare/floor_panel + alphafunc GT0 + } + { + map $lightmap + blendfunc filter + } } textures/map_warfare/sky { - qer_editorimage textures/skies/exosystem - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nodlight - surfaceparm nomarks - surfaceparm sky + qer_editorimage textures/skies/exosystem + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nodlight + surfaceparm nomarks + surfaceparm sky - q3map_sunext 1 1 1 350 60 42 3 16 - q3map_lightmapfilterradius 0 8 - q3map_skylight 400 4 + q3map_sunext 1 1 1 350 60 42 3 16 + q3map_lightmapfilterradius 0 8 + q3map_skylight 400 4 - skyparms env/exosystem/exosystem - - + skyparms env/exosystem/exosystem - - } textures/map_warfare/cactus { - qer_editorimage textures/map_warfare/cactus - qer_alphafunc qequal 0.5 + qer_editorimage textures/map_warfare/cactus + qer_alphafunc qequal 0.5 dpoffsetmapping - 2 match8 68 - dpglossintensitymod 2 - dpglossexponentmod 4 - - surfaceparm trans - surfaceparm nonsolid - - cull none - { - map textures/map_warfare/cactus - alphaFunc GT0 - } - { - map $lightmap - blendfunc filter - } + dpglossintensitymod 2 + dpglossexponentmod 4 + + surfaceparm trans + surfaceparm alphashadow + surfaceparm nonsolid + + cull none + { + map textures/map_warfare/cactus + alphafunc GT0 + } + { + map $lightmap + blendfunc filter + } }