From: MirceaKitsune Date: Mon, 7 Nov 2011 16:05:08 +0000 (+0200) Subject: Add default dpreflectcube to the exX shader, for textures meant to have reflections... X-Git-Tag: xonotic-v0.8.0~5^2~24 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47ddd5d8890d39ae65ba6178ed2e63019339489d;p=xonotic%2Fxonotic-maps.pk3dir.git Add default dpreflectcube to the exX shader, for textures meant to have reflections. Yes, this isn't permanent, and looks rather ugly. Once per-map cubemaps will be implemented, I can easily replace the keyword. For now, this is fun to test around with --- diff --git a/scripts/exx.shader b/scripts/exx.shader index acc5a0ef..81411a55 100644 --- a/scripts/exx.shader +++ b/scripts/exx.shader @@ -117,7 +117,7 @@ textures/exx/base-metal01 dpoffsetmapping - 2 match8 106 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal01.tga @@ -140,7 +140,7 @@ textures/exx/base-metal02 dpoffsetmapping - 2 match8 106 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal02.tga @@ -163,7 +163,7 @@ textures/exx/base-metal03 dpoffsetmapping - 2 match8 106 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal03.tga @@ -186,7 +186,7 @@ textures/exx/base-metal04 dpoffsetmapping - 2 match8 106 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal04.tga @@ -209,7 +209,7 @@ textures/exx/base-metal05rust dpoffsetmapping - 2 match8 70 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal05rust.tga @@ -232,7 +232,7 @@ textures/exx/base-metal06rust dpoffsetmapping - 2 match8 70 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal06rust.tga @@ -255,7 +255,7 @@ textures/exx/base-metal07rust dpoffsetmapping - 2 match8 70 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/base/base_metal07rust.tga @@ -278,8 +278,7 @@ textures/exx/floor-clang01 dpglossintensitymod 3 dpglossexponentmod 4 surfaceparm metalsteps - - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_clang01.tga @@ -302,7 +301,7 @@ textures/exx/floor-clang01b dpglossintensitymod 3 dpglossexponentmod 4 surfaceparm metalsteps - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_clang01b.tga @@ -416,7 +415,7 @@ textures/exx/floor-grate01 dpoffsetmapping - 2 match8 126 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate01.tga @@ -440,7 +439,7 @@ textures/exx/floor-grate01-cull dpoffsetmapping - 2 match8 126 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate01.tga @@ -465,7 +464,7 @@ textures/exx/floor-grate02 dpoffsetmapping - 2 match8 224 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate02.tga @@ -489,7 +488,7 @@ textures/exx/floor-grate02-cull dpoffsetmapping - 2 match8 224 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate02.tga @@ -514,7 +513,7 @@ textures/exx/floor-grate03 dpoffsetmapping - 2 match8 223 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate03.tga @@ -538,7 +537,7 @@ textures/exx/floor-grate03-cull dpoffsetmapping - 2 match8 223 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate03.tga @@ -563,7 +562,7 @@ textures/exx/floor-grate04 dpoffsetmapping - 2 match8 248 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate04.tga @@ -588,7 +587,7 @@ textures/exx/floor-grate04-cull dpoffsetmapping - 2 match8 248 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_grate04.tga @@ -612,7 +611,7 @@ textures/exx/floor-metal02 dpoffsetmapping - 2 match8 241 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_metal02.tga @@ -634,7 +633,7 @@ textures/exx/floor-panel01 dpoffsetmapping - 2 match8 172 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_panel01.tga @@ -657,7 +656,7 @@ textures/exx/floor-rnd01 dpoffsetmapping - 2 match8 128 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_rnd01.tga @@ -680,7 +679,7 @@ textures/exx/floor-rnd02 dpoffsetmapping - 2 match8 110 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_rnd02.tga @@ -703,7 +702,7 @@ textures/exx/floor-simple05 dpoffsetmapping - 4 match8 32 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_simple05.tga @@ -725,7 +724,7 @@ textures/exx/floor-simplines dpoffsetmapping - 1 match8 244 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_simplines.tga @@ -748,7 +747,7 @@ textures/exx/floor-tile03 dpoffsetmapping - 2 match8 218 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_tile03.tga @@ -771,7 +770,7 @@ textures/exx/floor-tread01 dpoffsetmapping - 1 match8 221 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/floor/floor_tread01.tga @@ -885,6 +884,7 @@ textures/exx/light-panel01 dpoffsetmapping - 2 match8 79 dpglossintensitymod 3 dpglossexponentmod 4 + dpreflectcube cubemaps/default/sky { map textures/exx/light/light_panel01.tga @@ -910,6 +910,8 @@ textures/exx/light-panel01-surfacelight q3map_surfacelight 2500 q3map_lightSubdivide 64 + dpreflectcube cubemaps/default/sky + { map textures/exx/light/light_panel01.tga @@ -931,6 +933,8 @@ textures/exx/light-u201 dpglossintensitymod 3 dpglossexponentmod 4 + dpreflectcube cubemaps/default/sky + { map textures/exx/light/light_u201.tga @@ -955,6 +959,8 @@ textures/exx/light-u201-surfacelight q3map_surfacelight 2500 q3map_lightSubdivide 64 + dpreflectcube cubemaps/default/sky + { map textures/exx/light/light_u201.tga @@ -984,6 +990,9 @@ textures/exx/panel-grate01 cull none nopicmip nomipmaps + + dpreflectcube cubemaps/default/sky + { map textures/exx/panel/panel_grate01.tga alphaFunc GT0 @@ -1012,6 +1021,9 @@ textures/exx/panel-grate01-cull nopicmip nomipmaps + + dpreflectcube cubemaps/default/sky + { map textures/exx/panel/panel_grate01.tga alphaFunc GT0 @@ -1033,7 +1045,7 @@ textures/exx/panel-metal01 dpoffsetmapping - 2 match8 101 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal01.tga @@ -1056,7 +1068,7 @@ textures/exx/panel-metal01b dpoffsetmapping - 2 match8 101 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal01b.tga @@ -1079,7 +1091,7 @@ textures/exx/panel-metal01c dpoffsetmapping - 2 match8 116 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal01c.tga @@ -1102,7 +1114,7 @@ textures/exx/panel-metal02 dpoffsetmapping - 2 match8 216 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal02.tga @@ -1125,7 +1137,7 @@ textures/exx/panel-metal03 dpoffsetmapping - 2 match8 241 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal03.tga @@ -1148,7 +1160,7 @@ textures/exx/panel-metal04 dpoffsetmapping - 2 match8 229 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal04.tga @@ -1171,7 +1183,7 @@ textures/exx/panel-metal05 dpoffsetmapping - 2 match8 238 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metal05.tga @@ -1194,7 +1206,7 @@ textures/exx/panel-metalbig04 dpoffsetmapping - 2 match8 165 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metalbig04.tga @@ -1217,7 +1229,7 @@ textures/exx/panel-metalbig04b dpoffsetmapping - 2 match8 177 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_metalbig04b.tga @@ -1240,7 +1252,7 @@ textures/exx/panel-q201 dpoffsetmapping - 2 match8 138 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_q201.tga @@ -1263,7 +1275,7 @@ textures/exx/panel-q201b dpoffsetmapping - 2 match8 81 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_q201b.tga @@ -1286,7 +1298,7 @@ textures/exx/panel-q201c dpoffsetmapping - 2 match8 98 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_q201c.tga @@ -1309,7 +1321,7 @@ textures/exx/panel-q201d dpoffsetmapping - 2 match8 189 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_q201d.tga @@ -1332,7 +1344,7 @@ textures/exx/panel-q201e dpoffsetmapping - 2 match8 132 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_q201e.tga @@ -1355,7 +1367,7 @@ textures/exx/panel-rs01 dpoffsetmapping - 2 match8 178 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/panel/panel_rs01.tga @@ -1378,7 +1390,7 @@ textures/exx/trim-01 dpoffsetmapping - 2 match8 169 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_01.tga @@ -1401,7 +1413,7 @@ textures/exx/trim-baseboard dpoffsetmapping - 2 match8 181 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_baseboard.tga @@ -1423,7 +1435,7 @@ textures/exx/trim-baseboard02 dpoffsetmapping - 2 match8 162 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_baseboard02.tga @@ -1446,7 +1458,7 @@ textures/exx/trim-baseboard03 dpoffsetmapping - 2 match8 110 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_baseboard03.tga @@ -1469,7 +1481,7 @@ textures/exx/trim-metalsupp01 dpoffsetmapping - 8 match8 243 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_metalsupp01.tga @@ -1492,7 +1504,7 @@ textures/exx/trim-psimple04 dpoffsetmapping - 2 match8 44 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_psimple04.tga @@ -1515,7 +1527,7 @@ textures/exx/trim-psimple05 dpoffsetmapping - 2 match8 230 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_psimple05.tga @@ -1538,7 +1550,7 @@ textures/exx/trim-simple01 dpoffsetmapping - 2 match8 213 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_simple01.tga @@ -1561,7 +1573,7 @@ textures/exx/trim-simple03 dpoffsetmapping - 2 match8 142 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_simple03.tga @@ -1584,7 +1596,7 @@ textures/exx/trim-steptop01 dpoffsetmapping - 2 match8 140 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_steptop01.tga @@ -1607,7 +1619,7 @@ textures/exx/trim-support03 dpoffsetmapping - 2 match8 111 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_support03.tga @@ -1630,7 +1642,7 @@ textures/exx/trim-vert01 dpoffsetmapping - 2 match8 231 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_vert01.tga @@ -1653,7 +1665,7 @@ textures/exx/trim-horz01 dpoffsetmapping - 2 match8 231 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/trim/trim_horz01.tga @@ -1677,7 +1689,7 @@ textures/exx/wall-bigrib02 dpoffsetmapping - 2 match8 250 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_bigrib02.tga @@ -1700,7 +1712,7 @@ textures/exx/wall-bplate06 dpoffsetmapping - 8 match8 114 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_bplate06.tga @@ -1811,7 +1823,7 @@ textures/exx/wall-des01 dpoffsetmapping - 2 match8 55 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_des01.tga @@ -1834,7 +1846,7 @@ textures/exx/wall-metal01 dpoffsetmapping - 2 match8 225 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_metal01.tga @@ -1857,7 +1869,7 @@ textures/exx/wall-metal01b dpoffsetmapping - 2 match8 225 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_metal01b.tga @@ -1880,7 +1892,7 @@ textures/exx/wall-metal02 dpoffsetmapping - 2 match8 177 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_metal02.tga @@ -1903,7 +1915,7 @@ textures/exx/wall-metalb01 dpoffsetmapping - 1 match8 37 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_metalb01.tga @@ -1926,7 +1938,7 @@ textures/exx/wall-metalrib01 dpoffsetmapping - 2 match8 216 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_metalrib01.tga @@ -1949,7 +1961,7 @@ textures/exx/wall-panel05 dpoffsetmapping - 2 match8 66 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_panel05.tga @@ -1972,7 +1984,7 @@ textures/exx/wall-panels08 dpoffsetmapping - 2 match8 195 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_panels08.tga @@ -1995,7 +2007,7 @@ textures/exx/wall-panels08b dpoffsetmapping - 2 match8 195 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_panels08b.tga @@ -2018,7 +2030,7 @@ textures/exx/wall-pipe dpoffsetmapping - 2 match8 157 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_pipe.tga @@ -2041,7 +2053,7 @@ textures/exx/wall-u207 dpoffsetmapping - 2 match8 109 dpglossintensitymod 3 dpglossexponentmod 4 - + dpreflectcube cubemaps/default/sky { map textures/exx/wall/wall_u207.tga