From 5fecbf8576cb988e5a6df45922246046533c51a1 Mon Sep 17 00:00:00 2001 From: q3rally Date: Wed, 8 Jul 2020 10:27:01 +0000 Subject: [PATCH] more shaderworks :-) --- baseq3r/scripts/q3r_textures.shader | 485 +++++++++++++++++++++++++++- baseq3r/scripts/road.shader | 283 ---------------- baseq3r/scripts/signage.shader | 177 ---------- baseq3r/scripts/skies.shader | 85 ++++- 4 files changed, 555 insertions(+), 475 deletions(-) delete mode 100644 baseq3r/scripts/road.shader delete mode 100644 baseq3r/scripts/signage.shader diff --git a/baseq3r/scripts/q3r_textures.shader b/baseq3r/scripts/q3r_textures.shader index 5bde70b4..b2354c2a 100644 --- a/baseq3r/scripts/q3r_textures.shader +++ b/baseq3r/scripts/q3r_textures.shader @@ -2996,7 +2996,7 @@ textures/q3r_signage/dirsign03_red } // ------------------------------------------------------------ -// 158.q3r_signage (dirsign03_red) +// 158.q3r_signage (dirsign03_ylw) // ------------------------------------------------------------ textures/q3r_signage/dirsign03_ylw @@ -5063,14 +5063,10 @@ textures/terrain/q3rcountry2_5to6 } } +// ------------------------------------------------------------ +// 235.terrain (q3rcountry3_0) +// ------------------------------------------------------------ - -//**************************************************** -// ************************************************* -// * -// * Q3Rcountry3 test pathmap -// * -// ************************************************* textures/terrain/q3rcountry3_0 { surfaceparm nolightmap @@ -5092,6 +5088,10 @@ textures/terrain/q3rcountry3_0 } } +// ------------------------------------------------------------ +// 236.terrain (q3rcountry3_1) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1 { surfaceparm nolightmap @@ -5112,6 +5112,10 @@ textures/terrain/q3rcountry3_1 } } +// ------------------------------------------------------------ +// 237.terrain (q3rcountry3_2) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_2 { surfaceparm nolightmap @@ -5132,6 +5136,11 @@ textures/terrain/q3rcountry3_2 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 238.terrain (q3rcountry3_3) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_3 { surfaceparm nolightmap @@ -5152,6 +5161,11 @@ textures/terrain/q3rcountry3_3 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 239.terrain (q3rcountry3_4) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_4 { surfaceparm nolightmap @@ -5172,6 +5186,11 @@ textures/terrain/q3rcountry3_4 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 240.terrain (q3rcountry3_5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_5 { surfaceparm nolightmap @@ -5192,6 +5211,11 @@ textures/terrain/q3rcountry3_5 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 241.terrain (q3rcountry3_6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_6 { surfaceparm nolightmap @@ -5213,6 +5237,9 @@ textures/terrain/q3rcountry3_6 } } +// ------------------------------------------------------------ +// 242.terrain (q3rcountry3_0to1) +// ------------------------------------------------------------ textures/terrain/q3rcountry3_0to1 { @@ -5243,6 +5270,9 @@ textures/terrain/q3rcountry3_0to1 } } +// ------------------------------------------------------------ +// 243.terrain (q3rcountry3_0to2) +// ------------------------------------------------------------ textures/terrain/q3rcountry3_0to2 { @@ -5271,6 +5301,11 @@ textures/terrain/q3rcountry3_0to2 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 244.terrain (q3rcountry3_0to3) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_0to3 { surfaceparm nolightmap @@ -5299,6 +5334,11 @@ textures/terrain/q3rcountry3_0to3 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 245.terrain (q3rcountry3_0to4) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_0to4 { surfaceparm nolightmap @@ -5326,6 +5366,11 @@ textures/terrain/q3rcountry3_0to4 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 246.terrain (q3rcountry3_0to5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_0to5 { surfaceparm nolightmap @@ -5353,6 +5398,11 @@ textures/terrain/q3rcountry3_0to5 // tcmod transform 1 0 1 1 1 1 } } + +// ------------------------------------------------------------ +// 247.terrain (q3rcountry3_0to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_0to6 { surfaceparm nolightmap @@ -5381,6 +5431,10 @@ textures/terrain/q3rcountry3_0to6 } } +// ------------------------------------------------------------ +// 248.terrain (q3rcountry3_1to2) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1to2 { surfaceparm nolightmap @@ -5410,6 +5464,10 @@ textures/terrain/q3rcountry3_1to2 } } +// ------------------------------------------------------------ +// 249.terrain (q3rcountry3_1to3) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1to3 { surfaceparm nolightmap @@ -5439,6 +5497,10 @@ textures/terrain/q3rcountry3_1to3 } } +// ------------------------------------------------------------ +// 250.terrain (q3rcountry3_1to4) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1to4 { surfaceparm nolightmap @@ -5468,6 +5530,10 @@ textures/terrain/q3rcountry3_1to4 } } +// ------------------------------------------------------------ +// 251.terrain (q3rcountry3_1to5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1to5 { surfaceparm nolightmap @@ -5496,6 +5562,10 @@ textures/terrain/q3rcountry3_1to5 } } +// ------------------------------------------------------------ +// 252.terrain (q3rcountry3_1to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_1to6 { surfaceparm nolightmap @@ -5524,6 +5594,10 @@ textures/terrain/q3rcountry3_1to6 } } +// ------------------------------------------------------------ +// 253.terrain (q3rcountry3_2to3) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_2to3 { surfaceparm nolightmap @@ -5552,6 +5626,10 @@ textures/terrain/q3rcountry3_2to3 } } +// ------------------------------------------------------------ +// 254.terrain (q3rcountry3_2to4) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_2to4 { surfaceparm nolightmap @@ -5580,6 +5658,10 @@ textures/terrain/q3rcountry3_2to4 } } +// ------------------------------------------------------------ +// 255.terrain (q3rcountry3_2to5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_2to5 { surfaceparm nolightmap @@ -5609,6 +5691,10 @@ textures/terrain/q3rcountry3_2to5 } } +// ------------------------------------------------------------ +// 256.terrain (q3rcountry3_2to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_2to6 { surfaceparm nolightmap @@ -5638,6 +5724,10 @@ textures/terrain/q3rcountry3_2to6 } } +// ------------------------------------------------------------ +// 257.terrain (q3rcountry3_3to4) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_3to4 { surfaceparm nolightmap @@ -5667,6 +5757,10 @@ textures/terrain/q3rcountry3_3to4 } } +// ------------------------------------------------------------ +// 258.terrain (q3rcountry3_3to5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_3to5 { surfaceparm nolightmap @@ -5696,6 +5790,10 @@ textures/terrain/q3rcountry3_3to5 } } +// ------------------------------------------------------------ +// 259.terrain (q3rcountry3_3to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_3to6 { surfaceparm nolightmap @@ -5725,6 +5823,10 @@ textures/terrain/q3rcountry3_3to6 } } +// ------------------------------------------------------------ +// 260.terrain (q3rcountry3_4to5) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_4to5 { surfaceparm nolightmap @@ -5754,6 +5856,10 @@ textures/terrain/q3rcountry3_4to5 } } +// ------------------------------------------------------------ +// 261.terrain (q3rcountry3_4to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_4to6 { surfaceparm nolightmap @@ -5783,6 +5889,10 @@ textures/terrain/q3rcountry3_4to6 } } +// ------------------------------------------------------------ +// 262.terrain (q3rcountry3_5to6) +// ------------------------------------------------------------ + textures/terrain/q3rcountry3_5to6 { surfaceparm nolightmap @@ -5810,4 +5920,363 @@ textures/terrain/q3rcountry3_5to6 // tcmod scale 0.015625 0.015625 // tcmod transform 1 0 1 1 1 1 } +} + +// ------------------------------------------------------------ +// 263.q3r_road (asph01) +// ------------------------------------------------------------ + +textures\q3r_road\asph01 +{ + qer_editorimage textures\q3r_road\asph01.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asph01.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 264.q3r_road (asph02) +// ------------------------------------------------------------ + +textures\q3r_road\asph02 +{ + qer_editorimage textures\q3r_road\asph02.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asph02.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 265.q3r_road (asph02linien) +// ------------------------------------------------------------ + +textures\q3r_road\asph02linien +{ + qer_editorimage textures\q3r_road\asph02linien.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asph02linien.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 266.q3r_road (asph02parking) +// ------------------------------------------------------------ + +textures\q3r_road\asph02parking +{ + qer_editorimage textures\q3r_road\asph02parking.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asph02parking.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 267.q3r_road (asph03) +// ------------------------------------------------------------ + +textures\q3r_road\asph03 +{ + qer_editorimage textures\q3r_road\asph03.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asph03.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 268.q3r_road (asphalt_lined) +// ------------------------------------------------------------ + +textures\q3r_road\asphalt_lined +{ + qer_editorimage textures\q3r_road\asphalt_lined.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\asphalt_lined.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 269.q3r_road (cobbels01) +// ------------------------------------------------------------ + +textures\q3r_road\cobbles01 +{ + qer_editorimage textures\q3r_road\cobbles01.jpg + cull disable + surfaceparm SURF_GRAVEL + { + map textures\q3r_road\cobbles01.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 270.q3r_road (concrete) +// ------------------------------------------------------------ + +textures\q3r_road\concrete +{ + qer_editorimage textures\q3r_road\concrete.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\concrete.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 271.q3r_road (road-1) +// ------------------------------------------------------------ + +textures\q3r_road\road-1 +{ + qer_editorimage textures\q3r_road\road-1.tga + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\raod-1.tga + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 272.q3r_road (road) +// ------------------------------------------------------------ + +textures\q3r_road\road +{ + qer_editorimage textures\q3r_road\road.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 273.q3r_road (road_02) +// ------------------------------------------------------------ + +textures\q3r_road\road_02 +{ + qer_editorimage textures\q3r_road\road_02.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_02.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 274.q3r_road (road_grid) +// ------------------------------------------------------------ + +textures\q3r_road\road_grid +{ + qer_editorimage textures\q3r_road\road_grid.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_grid.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 275.q3r_road (road_pitend) +// ------------------------------------------------------------ + +textures\q3r_road\road_pitend +{ + qer_editorimage textures\q3r_road\road_pitend.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_pitend.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 276.q3r_road (road_pitend_2) +// ------------------------------------------------------------ + +textures\q3r_road\road_pitend_2 +{ + qer_editorimage textures\q3r_road\road_pitend_2.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_pitend_2.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 277.q3r_road (road_pitend_3) +// ------------------------------------------------------------ + +textures\q3r_road\road_pitend_3 +{ + qer_editorimage textures\q3r_road\road_pitend_3.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_pitend_3.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 278.q3r_road (road_pitend_4) +// ------------------------------------------------------------ + +textures\q3r_road\road_pitend_4 +{ + qer_editorimage textures\q3r_road\road_pitend_4.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road_pitend_4.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 279.q3r_road (road-start) +// ------------------------------------------------------------ + +textures\q3r_road\road-start +{ + qer_editorimage textures\q3r_road\road-start.jpg + cull disable + surfaceparm SURF_ASPHALT + { + map textures\q3r_road\road-start.jpg + blendfunc blend + } +} + +// ------------------------------------------------------------ +// 280.q3r_ground (tuerkis_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/tuerkis_slick +{ + qer_editorimage textures/q3r_layout/tuerkis.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + { + map textures/q3r_layout/tuerkis.tga + } +} + +// ------------------------------------------------------------ +// 281.q3r_ground (snowy01_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy01_slick +{ + qer_editorimage textures/q3r_ground/snowy01.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy01.tga + } +} + +// ------------------------------------------------------------ +// 282.q3r_ground (snowy02_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy02_slick +{ + qer_editorimage textures/q3r_ground/snowy02.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy01.tga + } +} + +// ------------------------------------------------------------ +// 283.q3r_ground (snowy02_slick2) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy02_slick2 +{ + qer_editorimage textures/q3r_ground/snowy02_slick.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy02_slick.tga + } +} + +// ------------------------------------------------------------ +// 284.q3r_ground (snowy03_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy03_slick +{ + qer_editorimage textures/q3r_ground/snowy03.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy03.tga + } +} + +// ------------------------------------------------------------ +// 285.q3r_ground (snowy04_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy04_slick +{ + qer_editorimage textures/q3r_ground/snowy04.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy04.tga + } +} + +// ------------------------------------------------------------ +// 286.q3r_ground (snowy05_slick) +// ------------------------------------------------------------ + +textures/q3r_ground/snowy05_slick +{ + qer_editorimage textures/q3r_ground/snowy05.tga + surfaceparm SURF_SLICK + surfaceparm nolightmap + cull disable + { + map textures/q3r_ground/snowy05.tga + } } \ No newline at end of file diff --git a/baseq3r/scripts/road.shader b/baseq3r/scripts/road.shader deleted file mode 100644 index 4e77c31a..00000000 --- a/baseq3r/scripts/road.shader +++ /dev/null @@ -1,283 +0,0 @@ -textures\q3r_road\asph01 -{ - qer_editorimage textures\q3r_road\asph01.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asph01.jpg - blendfunc blend - } -} - -textures\q3r_road\asph02 - -{ - qer_editorimage textures\q3r_road\asph02.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asph02.jpg - blendfunc blend - } -} - -textures\q3r_road\asph02linien - -{ - qer_editorimage textures\q3r_road\asph02linien.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asph02linien.jpg - blendfunc blend - } -} - -textures\q3r_road\asph02parking - -{ - qer_editorimage textures\q3r_road\asph02parking.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asph02parking.jpg - blendfunc blend - } -} - -textures\q3r_road\asph03 - -{ - qer_editorimage textures\q3r_road\asph03.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asph03.jpg - blendfunc blend - } -} - -textures\q3r_road\asphalt_lined - -{ - qer_editorimage textures\q3r_road\asphalt_lined.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\asphalt_lined.jpg - blendfunc blend - } -} - -textures\q3r_road\cobbles01 - -{ - qer_editorimage textures\q3r_road\cobbles01.jpg - cull disable - surfaceparm SURF_GRAVEL - { - map textures\q3r_road\cobbles01.jpg - blendfunc blend - } -} - -textures\q3r_road\concrete - -{ - qer_editorimage textures\q3r_road\concrete.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\concrete.jpg - blendfunc blend - } -} - -textures\q3r_road\road-1 - -{ - qer_editorimage textures\q3r_road\road-1.tga - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\raod-1.tga - blendfunc blend - } -} - -textures\q3r_road\road - -{ - qer_editorimage textures\q3r_road\road.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road.jpg - blendfunc blend - } -} - -textures\q3r_road\road_02 - -{ - qer_editorimage textures\q3r_road\road_02.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_02.jpg - blendfunc blend - } -} - -textures\q3r_road\road_grid - -{ - qer_editorimage textures\q3r_road\road_grid.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_grid.jpg - blendfunc blend - } -} - -textures\q3r_road\road_pitend - -{ - qer_editorimage textures\q3r_road\road_pitend.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_pitend.jpg - blendfunc blend - } -} - -textures\q3r_road\road_pitend_2 - -{ - qer_editorimage textures\q3r_road\road_pitend_2.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_pitend_2.jpg - blendfunc blend - } -} - -textures\q3r_road\road_pitend_3 - -{ - qer_editorimage textures\q3r_road\road_pitend_3.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_pitend_3.jpg - blendfunc blend - } -} - -textures\q3r_road\road_pitend_4 - -{ - qer_editorimage textures\q3r_road\road_pitend_4.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road_pitend_4.jpg - blendfunc blend - } -} - -textures\q3r_road\road-start - -{ - qer_editorimage textures\q3r_road\road-start.jpg - cull disable - surfaceparm SURF_ASPHALT - { - map textures\q3r_road\road-start.jpg - blendfunc blend - } -} - -//////////////////////////////////////////////////////// -/// adding q3r_ground textures here for surfaceparm -/// --tbb -//////////////////////////////////////////////////////// - -textures/q3r_ground/tuerkis_slick -{ - qer_editorimage textures/q3r_layout/tuerkis.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - { - map textures/q3r_layout/tuerkis.tga - } -} - -textures/q3r_ground/snowy01_slick -{ - qer_editorimage textures/q3r_ground/snowy01.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy01.tga - } -} - -textures/q3r_ground/snowy02_slick -{ - qer_editorimage textures/q3r_ground/snowy02.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy01.tga - } -} - -textures/q3r_ground/snowy02_slick2 -{ - qer_editorimage textures/q3r_ground/snowy02_slick.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy02_slick.tga - } -} - -textures/q3r_ground/snowy03_slick -{ - qer_editorimage textures/q3r_ground/snowy03.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy03.tga - } -} - -textures/q3r_ground/snowy04_slick -{ - qer_editorimage textures/q3r_ground/snowy04.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy04.tga - } -} - -textures/q3r_ground/snowy05_slick -{ - qer_editorimage textures/q3r_ground/snowy05.tga - surfaceparm SURF_SLICK - surfaceparm nolightmap - cull disable - { - map textures/q3r_ground/snowy05.tga - } -} diff --git a/baseq3r/scripts/signage.shader b/baseq3r/scripts/signage.shader deleted file mode 100644 index 0aa3dfea..00000000 --- a/baseq3r/scripts/signage.shader +++ /dev/null @@ -1,177 +0,0 @@ -//====================== -// Direction Signs -//====================== - -textures/q3r_signage/dirsign03_blu - -{ - qer_editorimage textures/q3r_signage/dirsign02_blu.tga - cull disable - - { - map textures/q3r_signage/dirsign02_blu.tga - rgbgen vertex - } - -} - -textures/q3r_signage/dirsign03_bnw - -{ - cull disable - qer_editorimage textures/q3r_signage/dirsign02_bnw.tga - - { - map textures/q3r_signage/dirsign02_bnw.tga - rgbgen identity - } - -} - -textures/q3r_signage/dirsign03_grn - -{ - cull disable - qer_editorimage textures/q3r_signage/dirsign02_grn.tga - - { - map textures/q3r_signage/dirsign02_grn.tga - rgbgen identity - } - -} - -textures/q3r_signage/dirsign03_red - -{ - cull disable - qer_editorimage textures/q3r_signage/dirsign02_red.tga - { - map textures/q3r_signage/dirsign02_red.tga - rgbgen vertex - } - -} - -textures/q3r_signage/dirsign03_ylw - -{ - cull disable - qer_editorimage textures/q3r_signage/dirsign02_ylw.tga - - { - map textures/q3r_signage/dirsign02_ylw.tga - rgbgen identity - } - -} - -//================ -// Deco Flags -//================ - -textures/q3r_signage/flags01_blu -{ - cull disable - surfaceparm alphashadow - surfaceparm nonsolid - surfaceparm trans - surfaceparm nomarks - - { - map textures/q3r_signage/flags01_blu.tga - blendFunc blend - alphaFunc GE128 - depthWrite - rgbGen identity - } - { - map $lightmap - rgbGen identity - blendFunc GL_DST_COLOR GL_ZERO - depthFunc equal - } -} - -textures/q3r_signage/flags01_bnw -{ - cull disable - surfaceparm alphashadow - surfaceparm nonsolid - surfaceparm trans - surfaceparm nomarks - - { - map textures/q3r_signage/flags01_bnw.tga - blendFunc blend - alphaFunc GE128 - depthWrite - rgbGen identity - } - { - map $lightmap - rgbGen identity - blendFunc GL_DST_COLOR GL_ZERO - depthFunc equal - } -} - -textures/q3r_signage/flags01_grn -{ - cull disable - surfaceparm alphashadow - surfaceparm nonsolid - surfaceparm trans - surfaceparm nomarks - - { - map $lightmap - rgbgen identity - } - { - map textures/q3r_signage/flags01_grn.tga - blendFunc GL_DST_COLOR GL_SRC_ALPHA - alphaGen lightingSpecular - rgbGen identity - } -} - -textures/q3r_signage/flags01_red -{ - cull disable - surfaceparm alphashadow - surfaceparm nonsolid - surfaceparm trans - surfaceparm nomarks - - { - map $lightmap - rgbgen identity - } - { - map textures/q3r_signage/flags01_red.tga - blendFunc GL_DST_COLOR GL_SRC_ALPHA - alphaGen lightingSpecular - rgbGen identity - } -} - -textures/q3r_signage/flags01_ylw -{ - cull disable - surfaceparm alphashadow - surfaceparm nonsolid - surfaceparm trans - surfaceparm nomarks - - { - map $lightmap - rgbgen identity - } - { - map textures/q3r_signage/flags01_ylw.tga - blendFunc GL_DST_COLOR GL_SRC_ALPHA - alphaGen lightingSpecular - rgbGen identity - } -} diff --git a/baseq3r/scripts/skies.shader b/baseq3r/scripts/skies.shader index a7c6ac81..cd7cfd2d 100644 --- a/baseq3r/scripts/skies.shader +++ b/baseq3r/scripts/skies.shader @@ -1,3 +1,12 @@ +// ------------------------------------------------------------ +// Shaders for Q3Rally Skies - rewritten by P3rlE +// based on the skies and q3r_skies.shader +// ------------------------------------------------------------ + +// ------------------------------------------------------------ +// 1.skies (hellsky) +// ------------------------------------------------------------ + textures/skies/hellsky { qer_editorimage textures/skies/dimclouds.tga @@ -17,6 +26,10 @@ textures/skies/hellsky } } +// ------------------------------------------------------------ +// 2.skies (nightsky_xian_dm1) +// ------------------------------------------------------------ + textures/skies/nightsky_xian_dm1 { surfaceparm noimpact @@ -31,6 +44,10 @@ textures/skies/nightsky_xian_dm1 skyparms env/xnight2 - - } +// ------------------------------------------------------------ +// 3.skies (nightsky_xian_dm15) +// ------------------------------------------------------------ + textures/skies/nightsky_xian_dm15 { qer_editorimage textures/skies/xnight2_up.tga @@ -44,6 +61,10 @@ textures/skies/nightsky_xian_dm15 } +// ------------------------------------------------------------ +// 4.skies (kc_dm10sky) +// ------------------------------------------------------------ + textures/skies/kc_dm10sky { q3map_lightimage textures/skies/pjbasesky.tga @@ -74,6 +95,10 @@ textures/skies/kc_dm10sky } +// ------------------------------------------------------------ +// 5.skies (trainyard) +// ------------------------------------------------------------ + textures/q3r_skies/env/trainyard/trainyard { qer_editorimage textures/q3r_skies/env/trainyard/trainyard_lf.tga @@ -87,6 +112,10 @@ textures/q3r_skies/env/trainyard/trainyard skyparms textures/q3r_skies/env/trainyard/trainyard - - } +// ------------------------------------------------------------ +// 6.skies (clouds) +// ------------------------------------------------------------ + textures/q3r_skies/clouds { qer_editorimage textures/q3r_skies/clouds.tga @@ -106,6 +135,10 @@ textures/q3r_skies/clouds } } +// ------------------------------------------------------------ +// 7.skies (pjbasesky_arena1_sky) +// ------------------------------------------------------------ + textures/skies/pjbasesky_arena1_sky { qer_editorimage textures/skies/pjbasesky.tga @@ -132,6 +165,9 @@ textures/skies/pjbasesky_arena1_sky } } +// ------------------------------------------------------------ +// 8.skies (mp_us) +// ------------------------------------------------------------ textures/q3r_skies/env/mp_us/mp_us { @@ -146,6 +182,10 @@ textures/q3r_skies/env/mp_us/mp_us skyparms textures/q3r_skies/env/mp_us/urbansp - - } +// ------------------------------------------------------------ +// 9.skies (sincity) +// ------------------------------------------------------------ + textures/q3r_skies/env/sincity/sincity { qer_editorimage textures/q3r_skies/env/sincity/sincity_ft.tga @@ -159,6 +199,10 @@ textures/q3r_skies/env/sincity/sincity skyparms textures/q3r_skies/env/sincity/sincity - - } +// ------------------------------------------------------------ +// 10.skies (night01) +// ------------------------------------------------------------ + textures/stecki/night01 { qer_editorimage textures/stecki/night01_up.tga @@ -173,6 +217,10 @@ textures/stecki/night01 } +// ------------------------------------------------------------ +// 11.skies (desert) +// ------------------------------------------------------------ + textures/stecki/desert { qer_editorimage textures/stecki/desert_rt.tga @@ -188,6 +236,10 @@ textures/stecki/desert } +// ------------------------------------------------------------ +// 12.skies (sub01) +// ------------------------------------------------------------ + textures/stecki/sub01 { qer_editorimage textures/stecki/sub01_rt.tga @@ -203,9 +255,9 @@ textures/stecki/sub01 } -//////////////////////////////////////////// -/// thebigbuu's mkart-map series skyboxes // -//////////////////////////////////////////// +// ------------------------------------------------------------ +// 13.skies (mkart1) +// ------------------------------------------------------------ textures/q3r_skies/env/mkart1/mkart1 { @@ -220,6 +272,10 @@ textures/q3r_skies/env/mkart1/mkart1 skyparms textures/q3r_skies/env/mkart1/mkart1 - - } +// ------------------------------------------------------------ +// 14.skies (mkart2) +// ------------------------------------------------------------ + textures/q3r_skies/env/mkart2/mkart2 { qer_editorimage textures/q3r_skies/env/mkart2/mkart2_ft.tga @@ -233,6 +289,10 @@ textures/q3r_skies/env/mkart2/mkart2 skyparms textures/q3r_skies/env/mkart2/mkart2 - - } +// ------------------------------------------------------------ +// 15.skies (mkart3) +// ------------------------------------------------------------ + textures/q3r_skies/env/mkart3/mkart3 { qer_editorimage textures/q3r_skies/env/mkart3/mkart3_ft.tga @@ -246,6 +306,10 @@ textures/q3r_skies/env/mkart3/mkart3 skyparms textures/q3r_skies/env/mkart3/mkart3 - - } +// ------------------------------------------------------------ +// 16.skies (mkart4) +// ------------------------------------------------------------ + textures/q3r_skies/env/mkart4/mkart4 { qer_editorimage textures/q3r_skies/env/mkart4/mkart4_ft.tga @@ -259,6 +323,10 @@ textures/q3r_skies/env/mkart4/mkart4 skyparms textures/q3r_skies/env/mkart4/mkart4 - - } +// ------------------------------------------------------------ +// 17.skies (mkart5) +// ------------------------------------------------------------ + textures/q3r_skies/env/mkart5/mkart5 { qer_editorimage textures/q3r_skies/env/mkart5/mkart5_bk.tga @@ -273,10 +341,9 @@ textures/q3r_skies/env/mkart5/mkart5 skyparms textures/q3r_skies/env/mkart5/mkart5 - - } -//q3rally ctf skybox, sorry for the NES style look, lol ; -//NOTICE:red section facing 180deg(_lf = left); -//blue section facing 0deg(_rt = right); -//plan accordingly or this next skybox WILL DISORIENT players. --thebigbuu; +// ------------------------------------------------------------ +// 18.skies (q3r_curtainwide) +// ------------------------------------------------------------ textures/q3r_skies/env/q3r_curtainwide/q3r_curtainwide { @@ -291,6 +358,10 @@ textures/q3r_skies/env/q3r_curtainwide/q3r_curtainwide skyparms textures/q3r_skies/env/q3r_curtainwide/q3r_curtainwide - - } +// ------------------------------------------------------------ +// 19.skies (ame_nebula) +// ------------------------------------------------------------ + textures/q3r_skies/env/ame_nebula { qer_editorimage textures/q3r_skies/env/ame_nebula/purplenebula_ft.tga