From: terencehill Date: Sat, 30 Oct 2021 19:32:55 +0000 (+0200) Subject: Fix whitespace in shader files X-Git-Tag: xonotic-v0.8.5~311 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=150e200ecdadbbf7866e3129c2643e2f9003bbcf;p=xonotic%2Fxonotic-data.pk3dir.git Fix whitespace in shader files --- diff --git a/scripts/akordeon.shader b/scripts/akordeon.shader index 19a304173..e44c0f907 100644 --- a/scripts/akordeon.shader +++ b/scripts/akordeon.shader @@ -1,9 +1,9 @@ akordeon { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - { + { map models/weapons/akordeon.tga rgbgen lightingDiffuse } -} \ No newline at end of file +} diff --git a/scripts/cellammo.shader b/scripts/cellammo.shader index 0d6197cf7..ed37b254d 100644 --- a/scripts/cellammo.shader +++ b/scripts/cellammo.shader @@ -2,8 +2,8 @@ cellammo { dpreflectcube cubemaps/default/sky dpoffsetmapping - 0.5 match8 128 - { + { map textures/items/cellammo rgbgen lightingDiffuse } -} \ No newline at end of file +} diff --git a/scripts/crylink.shader b/scripts/crylink.shader index ab59f84aa..ed0631c80 100644 --- a/scripts/crylink.shader +++ b/scripts/crylink.shader @@ -1,9 +1,8 @@ crylink_new { dpreflectcube cubemaps/default/sky - { + { map textures/crylink_new.tga rgbgen lightingDiffuse } } - diff --git a/scripts/ctf.shader b/scripts/ctf.shader index db6939f15..827d7c5a7 100644 --- a/scripts/ctf.shader +++ b/scripts/ctf.shader @@ -42,4 +42,4 @@ models/ctf/glow_neutral tcMod scroll 0.1 -0.04 tcMod rotate 0.1 } -} \ No newline at end of file +} diff --git a/scripts/electro.shader b/scripts/electro.shader index 8901438e8..4644037a8 100644 --- a/scripts/electro.shader +++ b/scripts/electro.shader @@ -8,17 +8,17 @@ electro_plasma electro_plasma_hull { - { + { map textures/electro_plasma_hull.tga alphaFunc GE128 rgbGen Vertex - } + } } electro { dpreflectcube cubemaps/default/sky - { + { map textures/electronew.tga rgbgen lightingDiffuse } diff --git a/scripts/explosiveammo.shader b/scripts/explosiveammo.shader index d6c3a90d3..fed76577f 100644 --- a/scripts/explosiveammo.shader +++ b/scripts/explosiveammo.shader @@ -1,7 +1,7 @@ explosive_ammo { dpreflectcube cubemaps/default/sky - { + { map textures/items/explosiveammo.tga rgbgen lightingDiffuse } @@ -9,12 +9,8 @@ explosive_ammo explosive_ammo_icons { { - animMap 2 textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_01.tga textures/items/explosiveammo_icon_blank.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_02.tga textures/items/explosiveammo_icon_blank.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_03.tga textures/items/explosiveammo_icon_blank.tga blendFunc GL_ONE GL_ONE rgbGen wave sawtooth 0 1 0 10 } - } - - diff --git a/scripts/gl.shader b/scripts/gl.shader index 9f0ffb462..c5ff5dcc7 100644 --- a/scripts/gl.shader +++ b/scripts/gl.shader @@ -1,7 +1,7 @@ grenadelauncher { dpreflectcube cubemaps/default/sky - { + { map textures/grenadelauncher.tga rgbgen lightingDiffuse } @@ -9,12 +9,8 @@ grenadelauncher grenadelauncher_sight { { - animMap 1 textures/glsight01.tga textures/glsight02.tga textures/glsight03.tga blendFunc GL_ONE GL_ONE rgbGen wave sawtooth 0 1 0 10 } - } - - diff --git a/scripts/hlac.shader b/scripts/hlac.shader index cd85d936f..ad9322f7d 100644 --- a/scripts/hlac.shader +++ b/scripts/hlac.shader @@ -9,11 +9,11 @@ hlac_plasma hlac_metal { - cull none - { - map textures/hlac_metal.tga - rgbgen vertex - } + cull none + { + map textures/hlac_metal.tga + rgbgen vertex + } } hlac_glass { @@ -27,7 +27,7 @@ hlac_glass //rgbGen vertex tcgen environment tcmod scale 4 4 - } + } } hlac_bullet { @@ -36,5 +36,5 @@ hlac_bullet { map models/hlac_bullet.tga blendfunc add - } + } } diff --git a/scripts/items.shader b/scripts/items.shader index 4d6565719..f27f8d959 100644 --- a/scripts/items.shader +++ b/scripts/items.shader @@ -1,7 +1,7 @@ models/items/5hp { dpreflectcube cubemaps/default/sky - { + { map models/items/5hp.tga rgbgen lightingDiffuse } @@ -9,7 +9,7 @@ models/items/5hp models/items/h25 { dpreflectcube cubemaps/default/sky - { + { map models/items/h25.tga rgbgen lightingDiffuse } @@ -17,7 +17,7 @@ models/items/h25 models/items/red { dpreflectcube cubemaps/default/sky - { + { map models/items/red.tga blendfunc filter rgbgen lightingDiffuse @@ -26,7 +26,7 @@ models/items/red models/items/h50 { dpreflectcube cubemaps/default/sky - { + { map models/items/h50.tga rgbgen lightingDiffuse } @@ -34,8 +34,8 @@ models/items/h50 models/items/h_mega { dpreflectcube cubemaps/default/sky - { + { map models/items/h_mega.tga rgbgen lightingDiffuse } -} \ No newline at end of file +} diff --git a/scripts/leiprojectile.shader b/scripts/leiprojectile.shader index f94c04b33..d43fd6657 100644 --- a/scripts/leiprojectile.shader +++ b/scripts/leiprojectile.shader @@ -86,4 +86,3 @@ models/elecbeam tcMod scroll -2 0 } } - diff --git a/scripts/minigames.shader b/scripts/minigames.shader index 053e6fc84..237151a9c 100644 --- a/scripts/minigames.shader +++ b/scripts/minigames.shader @@ -4,8 +4,8 @@ minigame_busy cull none nopicmip - { + { map models/sprites/minigame_busy blendfunc blend } -} +} diff --git a/scripts/mnex.shader b/scripts/mnex.shader index da5850644..835eb6d62 100644 --- a/scripts/mnex.shader +++ b/scripts/mnex.shader @@ -1,10 +1,10 @@ MNex-Diffuse { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - dpoffsetmapping - 0.125 match8 128 - { + dpoffsetmapping - 0.125 match8 128 + { map models/weapons/mnex.tga rgbgen lightingDiffuse } -} \ No newline at end of file +} diff --git a/scripts/monsters.shader b/scripts/monsters.shader index 5304b257c..25f1ca3ca 100644 --- a/scripts/monsters.shader +++ b/scripts/monsters.shader @@ -13,4 +13,4 @@ mage { map textures/mage } -} \ No newline at end of file +} diff --git a/scripts/nexball.shader b/scripts/nexball.shader index 6bf479311..d99994543 100644 --- a/scripts/nexball.shader +++ b/scripts/nexball.shader @@ -1,7 +1,7 @@ nexball/ball { dpreflectcube cubemaps/default/sky - { + { map textures/nexball/ball.tga rgbgen lightingDiffuse } diff --git a/scripts/ok_player.shader b/scripts/ok_player.shader index 2d488562f..94a445bb5 100644 --- a/scripts/ok_player.shader +++ b/scripts/ok_player.shader @@ -1,8 +1,8 @@ okplayer { - dpglossexponentmod 8 + dpglossexponentmod 8 dpreflectcube env/exomorph/exomorph - { + { map models/ok_player/okplayer.tga rgbgen lightingDiffuse } diff --git a/scripts/okweapons.shader b/scripts/okweapons.shader index 163da49b6..95057f006 100644 --- a/scripts/okweapons.shader +++ b/scripts/okweapons.shader @@ -1,8 +1,8 @@ OK_SMG { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - { + { map textures/weapons/ok_smg.tga rgbgen lightingDiffuse } @@ -10,9 +10,9 @@ OK_SMG OK_Railgun { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - { + { map textures/weapons/ok_railgun.tga rgbgen lightingDiffuse } @@ -20,9 +20,9 @@ OK_Railgun OK_shotgun { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - { + { map textures/weapons/ok_shotgun.tga rgbgen lightingDiffuse } @@ -31,9 +31,9 @@ OK_shotgun minsta { - dpglossexponentmod 64 + dpglossexponentmod 64 dpreflectcube env/exomorph/exomorph - { + { map models/weapons/okweapons.tga rgbgen lightingDiffuse } @@ -43,7 +43,7 @@ okrocketthrust { deformVertexes autosprite2 cull none - { + { map models/weapons/okrocketthrust.tga tcmod page 4 4 0.01 blendfunc add @@ -53,10 +53,9 @@ okrocketthrust okrocketthrust2 { deformVertexes autosprite - { + { map models/weapons/okrocketthrust.tga tcmod page 4 4 0.01 blendfunc add } - } diff --git a/scripts/onslaught.shader b/scripts/onslaught.shader index 6b9c9461a..3ccd5aa6a 100644 --- a/scripts/onslaught.shader +++ b/scripts/onslaught.shader @@ -96,4 +96,4 @@ cull none tcMod rotate 85 blendfunc add } -} \ No newline at end of file +} diff --git a/scripts/orbs.shader b/scripts/orbs.shader index 26d1fdfa2..4964ee743 100644 --- a/scripts/orbs.shader +++ b/scripts/orbs.shader @@ -45,4 +45,4 @@ models/orbs/orbpink tcmod page 4 4 0.05 rgbgen vertex } -} \ No newline at end of file +} diff --git a/scripts/player_erebus.shader b/scripts/player_erebus.shader index 1499ff1a0..01c3e7450 100644 --- a/scripts/player_erebus.shader +++ b/scripts/player_erebus.shader @@ -1,7 +1,7 @@ erebus { dpreflectcube cubemaps/default/sky - { + { map textures/erebus.tga rgbgen lightingDiffuse } @@ -10,7 +10,7 @@ erebus erebusfullbright { dpreflectcube cubemaps/default/sky - { + { map textures/erebusfullbright.tga rgbgen lightingDiffuse } @@ -19,7 +19,7 @@ erebusfullbright shadowhead { dpreflectcube cubemaps/default/sky - { + { map textures/shadowhead.tga rgbgen lightingDiffuse } diff --git a/scripts/player_gak.shader b/scripts/player_gak.shader index 734175797..6592b2a4a 100644 --- a/scripts/player_gak.shader +++ b/scripts/player_gak.shader @@ -1,7 +1,7 @@ gak { dpreflectcube cubemaps/default/sky - { + { map textures/gak.tga rgbgen lightingDiffuse } @@ -9,7 +9,7 @@ gak gakfullbright { dpreflectcube cubemaps/default/sky - { + { map textures/gakfullbright.tga rgbgen lightingDiffuse } @@ -18,7 +18,7 @@ gakfullbright gakarmor { dpreflectcube cubemaps/default/sky - { + { map textures/gakarmor.tga rgbgen lightingDiffuse } @@ -26,7 +26,7 @@ gakarmor gakarmorfb { dpreflectcube cubemaps/default/sky - { + { map textures/gakarmorfb.tga rgbgen lightingDiffuse } diff --git a/scripts/player_ignis.shader b/scripts/player_ignis.shader index 23d132951..81fc6fc58 100644 --- a/scripts/player_ignis.shader +++ b/scripts/player_ignis.shader @@ -1,7 +1,7 @@ ignis { dpreflectcube cubemaps/default/sky - { + { map textures/ignis.tga rgbgen lightingDiffuse } @@ -9,7 +9,7 @@ ignis ignisfullbright { dpreflectcube cubemaps/default/sky - { + { map textures/ignisfullbright.tga rgbgen lightingDiffuse } @@ -18,7 +18,7 @@ ignisfullbright ignishead { dpreflectcube cubemaps/default/sky - { + { map textures/ignishead.tga rgbgen lightingDiffuse } diff --git a/scripts/player_nyx.shader b/scripts/player_nyx.shader index e7df7ec30..416573079 100644 --- a/scripts/player_nyx.shader +++ b/scripts/player_nyx.shader @@ -1,7 +1,7 @@ nyx { dpreflectcube cubemaps/default/sky - { + { map textures/nyx.tga rgbgen lightingDiffuse } @@ -9,9 +9,8 @@ nyx nyxfullbright { dpreflectcube cubemaps/default/sky - { + { map textures/nyxfullbright.tga rgbgen lightingDiffuse } } - diff --git a/scripts/player_pyria.shader b/scripts/player_pyria.shader index 3d8e1dd23..c2439b200 100644 --- a/scripts/player_pyria.shader +++ b/scripts/player_pyria.shader @@ -1,7 +1,7 @@ pyria { dpreflectcube cubemaps/default/sky - { + { map textures/pyria.tga rgbgen lightingDiffuse } @@ -9,7 +9,7 @@ pyria pyriafullbright { dpreflectcube cubemaps/default/sky - { + { map textures/pyriafullbright.tga rgbgen lightingDiffuse } @@ -17,7 +17,6 @@ pyriafullbright pyriahair { - surfaceparm trans cull none diff --git a/scripts/player_seraphina.shader b/scripts/player_seraphina.shader index af5062d1f..1f77965cd 100644 --- a/scripts/player_seraphina.shader +++ b/scripts/player_seraphina.shader @@ -1,7 +1,7 @@ seraphina { dpreflectcube cubemaps/default/sky - { + { map textures/seraphina.tga rgbgen lightingDiffuse } diff --git a/scripts/player_umbra.shader b/scripts/player_umbra.shader index be722a123..0a51572b7 100644 --- a/scripts/player_umbra.shader +++ b/scripts/player_umbra.shader @@ -1,7 +1,7 @@ umbra { dpreflectcube cubemaps/default/sky - { + { map textures/umbra.tga rgbgen lightingDiffuse } @@ -9,9 +9,8 @@ umbra umbrafullbright { dpreflectcube cubemaps/default/sky - { + { map textures/umbrafullbright.tga rgbgen lightingDiffuse } } - diff --git a/scripts/rl.shader b/scripts/rl.shader index a8a030bfe..d016c17ed 100644 --- a/scripts/rl.shader +++ b/scripts/rl.shader @@ -1,7 +1,7 @@ RL { dpreflectcube cubemaps/default/sky - { + { map textures/rl_new.tga rgbgen lightingDiffuse } @@ -10,12 +10,9 @@ RocketThrust { cull none { - animMap 50 textures/rl_trust01.tga textures/rl_trust02.tga textures/rl_trust03.tga textures/rl_trust04.tga blendFunc GL_ONE GL_ONE rgbGen wave sawtooth 0 1 0 10 } } - - diff --git a/scripts/shotgun.shader b/scripts/shotgun.shader index 6bd301b7a..1449889ed 100644 --- a/scripts/shotgun.shader +++ b/scripts/shotgun.shader @@ -6,5 +6,5 @@ shotgun_sight map textures/shotgun_sight.tga blendfunc add //rgbGen vertex - } + } } diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader index 3a7d11eaf..76edd6dd3 100644 --- a/scripts/simpleitems.shader +++ b/scripts/simpleitems.shader @@ -7,7 +7,7 @@ a_cells_simple // cells cull none nopicmip - { + { map models/items/a_cells_simple blendfunc blend } @@ -19,7 +19,7 @@ a_rockets_simple // rockets cull none nopicmip - { + { map models/items/a_rockets_simple blendfunc blend } @@ -31,10 +31,9 @@ a_bullets_simple // bullets cull none nopicmip - { + { map models/items/a_bullets_simple blendfunc blend - } } @@ -44,10 +43,9 @@ a_shells_simple // shells cull none nopicmip - { + { map models/items/a_shells_simple blendfunc blend - } } @@ -57,12 +55,11 @@ g_arc_simple // arc { deformVertexes autosprite cull none - nopicmip + nopicmip { map models/weapons/g_arc_simple blendfunc blend - } } @@ -70,12 +67,11 @@ g_crylink_simple // crylink { deformVertexes autosprite cull none - nopicmip + nopicmip { map models/weapons/g_crylink_simple blendfunc blend - } } @@ -85,10 +81,9 @@ g_electro_simple // electro cull none nopicmip - { + { map models/weapons/g_electro_simple blendfunc blend - } } @@ -98,10 +93,9 @@ g_nex_simple // vortex cull none nopicmip - { + { map models/weapons/g_nex_simple blendfunc blend - } } @@ -111,10 +105,9 @@ g_hagar_simple // hagar cull none nopicmip - { + { map models/weapons/g_hagar_simple blendfunc blend - } } @@ -124,10 +117,9 @@ g_gl_simple // mortar cull none nopicmip - { + { map models/weapons/g_gl_simple blendfunc blend - } } @@ -137,10 +129,9 @@ g_rl_simple // devastator cull none nopicmip - { + { map models/weapons/g_rl_simple blendfunc blend - } } @@ -150,10 +141,9 @@ g_shotgun_simple // shotgun cull none nopicmip - { + { map models/weapons/g_shotgun_simple blendfunc blend - } } @@ -163,10 +153,9 @@ g_uzi_simple // machine gun cull none nopicmip - { + { map models/weapons/g_uzi_simple blendfunc blend - } } @@ -176,10 +165,9 @@ g_campingrifle_simple // sniper rifle cull none nopicmip - { + { map models/weapons/g_campingrifle_simple blendfunc blend - } } @@ -189,10 +177,9 @@ g_fireball_simple // fireball cull none nopicmip - { + { map models/weapons/g_fireball_simple blendfunc blend - } } @@ -202,10 +189,9 @@ g_hlac_simple // HLAC cull none nopicmip - { + { map models/weapons/g_hlac_simple blendfunc blend - } } @@ -215,10 +201,9 @@ g_hookgun_simple // hook gun cull none nopicmip - { + { map models/weapons/g_hookgun_simple blendfunc blend - } } @@ -228,10 +213,9 @@ g_laser_simple // blaster cull none nopicmip - { + { map models/weapons/g_laser_simple blendfunc blend - } } @@ -241,10 +225,9 @@ g_minelayer_simple // minelayer cull none nopicmip - { + { map models/weapons/g_minelayer_simple blendfunc blend - } } @@ -254,10 +237,9 @@ g_minstanex_simple // vaporizer cull none nopicmip - { + { map models/weapons/g_minstanex_simple blendfunc blend - } } @@ -267,10 +249,9 @@ g_porto_simple // portolauncher cull none nopicmip - { + { map models/weapons/g_porto_simple blendfunc blend - } } @@ -280,10 +261,9 @@ g_seeker_simple // tag seeker cull none nopicmip - { + { map models/weapons/g_seeker_simple blendfunc blend - } } @@ -293,10 +273,9 @@ g_tuba_simple // tuba cull none nopicmip - { + { map models/weapons/g_tuba_simple blendfunc blend - } } @@ -306,10 +285,9 @@ g_ok_hmg_simple // heavy machinegun cull none nopicmip - { + { map models/weapons/g_ok_hmg_simple blendfunc blend - } } @@ -319,10 +297,9 @@ g_ok_rl_simple // rocket propelled chainsaw cull none nopicmip - { + { map models/weapons/g_ok_rl_simple blendfunc blend - } } @@ -336,10 +313,9 @@ item_armor_small_simple // 5a cull none nopicmip - { + { map models/items/item_armor_small_simple blendfunc blend - } } @@ -349,10 +325,9 @@ item_armor_medium_simple // 25a cull none nopicmip - { + { map models/items/item_armor_medium_simple blendfunc blend - } } @@ -362,23 +337,21 @@ item_armor_big_simple // 50a cull none nopicmip - { + { map models/items/item_armor_big_simple blendfunc blend - } } -item_armor_large_simple // 100a +item_armor_large_simple // 100a { deformVertexes autosprite cull none nopicmip - { + { map models/items/item_armor_large_simple blendfunc blend - } } @@ -390,10 +363,9 @@ g_h1_simple // 5hp cull none nopicmip - { + { map models/items/g_h1_simple blendfunc blend - } } @@ -403,10 +375,9 @@ g_h25_simple // 25hp cull none nopicmip - { + { map models/items/g_h25_simple blendfunc blend - } } @@ -416,10 +387,9 @@ g_h50_simple // 50hp cull none nopicmip - { + { map models/items/g_h50_simple blendfunc blend - } } @@ -429,10 +399,9 @@ g_h100_simple // 100hp cull none nopicmip - { + { map models/items/g_h100_simple blendfunc blend - } } @@ -444,10 +413,9 @@ g_strength_simple // strength cull none nopicmip - { + { map models/items/g_strength_simple blendfunc blend - } } @@ -457,10 +425,9 @@ g_invincible_simple // shield cull none nopicmip - { + { map models/items/g_invincible_simple blendfunc blend - } } @@ -470,10 +437,9 @@ g_jetpack_simple // jetpack cull none nopicmip - { + { map models/items/g_jetpack_simple blendfunc blend - } } @@ -483,10 +449,9 @@ g_fuel_simple // fuel for jetpack cull none nopicmip - { + { map models/items/g_fuel_simple blendfunc blend - } } @@ -496,9 +461,8 @@ g_fuelregen_simple // fuel regen powerup cull none nopicmip - { + { map models/items/g_fuelregen_simple blendfunc blend - } } diff --git a/scripts/spiderbot.shader b/scripts/spiderbot.shader index 445fed53f..ce430b814 100644 --- a/scripts/spiderbot.shader +++ b/scripts/spiderbot.shader @@ -6,5 +6,5 @@ darkvisor rgbGen vertex tcgen environment tcmod scale 4 4 - } -} \ No newline at end of file + } +} diff --git a/scripts/teamfx.shader b/scripts/teamfx.shader index 8f368aff1..5b18c21d9 100644 --- a/scripts/teamfx.shader +++ b/scripts/teamfx.shader @@ -16,7 +16,6 @@ deformVertexes autosprite map models/teamfx/blobred.tga blendfunc add } - } teamfx/blobyellow @@ -27,7 +26,6 @@ deformVertexes autosprite map models/teamfx/blobyellow.tga blendfunc add } - } teamfx/blobpink @@ -38,7 +36,6 @@ deformVertexes autosprite map models/teamfx/blobpink.tga blendfunc add } - } teamfx/bluering @@ -57,6 +54,7 @@ surfaceparm trans blendfunc add } } + teamfx/yellowring { surfaceparm trans @@ -65,6 +63,7 @@ surfaceparm trans blendfunc add } } + teamfx/pinkring { surfaceparm trans @@ -73,6 +72,7 @@ surfaceparm trans blendfunc add } } + teamfx/flare { surfaceparm trans @@ -82,6 +82,7 @@ deformVertexes autosprite blendfunc add } } + teamfx/rayblue { surfaceparm trans @@ -91,6 +92,7 @@ deformVertexes autosprite blendfunc add } } + teamfx/rayred { surfaceparm trans @@ -100,6 +102,7 @@ deformVertexes autosprite blendfunc add } } + teamfx/rayyellow { surfaceparm trans @@ -109,6 +112,7 @@ deformVertexes autosprite blendfunc add } } + teamfx/raypink { surfaceparm trans diff --git a/scripts/turrets.shader b/scripts/turrets.shader index f407aba15..a31bd59b7 100644 --- a/scripts/turrets.shader +++ b/scripts/turrets.shader @@ -1,6 +1,6 @@ evil_basewall/mtl_gray { - { + { map textures/exx/base/base_metal01 rgbgen lightingDiffuse } @@ -8,16 +8,14 @@ evil_basewall/mtl_gray models/turrets/tesla_chrome { - qer_editorimage models/turrets/chrome.tga - //dp_reflect 0 0.75 0.75 1 0.5 + //dp_reflect 0 0.75 0.75 1 0.5 { - map models/turrets/chrome.tga + map models/turrets/chrome.tga rgbGen vertex - tcGen environment + tcGen environment tcMod scale 2 2 - } } @@ -28,11 +26,10 @@ models/turrets/phaser_beam nopicmip qer_editorimage models/turrets/phaser_beam - { + { map models/turrets/phaser_beam blendFunc GL_SRC_ALPHA GL_ONE } - } models/turrets/reactor_beams @@ -41,7 +38,7 @@ models/turrets/reactor_beams cull none qer_editorimage models/turrets/reactor - { + { map models/turrets/reactor blendFunc add } @@ -52,14 +49,11 @@ models/turrets/r_fx1 surfaceparm nomarks surfaceparm trans surfaceparm pointlight - surfaceparm nolightmap + surfaceparm nolightmap nopicmip qer_editorimage models/turrets/r_fx1_1 { - animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2 models/turrets/r_fx1_1 models/turrets/r_fx1_2 + animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2 models/turrets/r_fx1_1 models/turrets/r_fx1_2 } - } - - diff --git a/scripts/vehicles.shader b/scripts/vehicles.shader index 2d4d60675..c1057298c 100644 --- a/scripts/vehicles.shader +++ b/scripts/vehicles.shader @@ -1,38 +1,42 @@ spiderbot { dpreflectcube cubemaps/default/sky - { + { map textures/spiderbot.tga rgbgen lightingDiffuse } } + wakazachi { dpreflectcube cubemaps/default/sky - { + { map textures/wakazachi.tga rgbgen lightingDiffuse } } + cockpit { dpreflectcube cubemaps/default/sky - { + { map textures/cockpit.tga rgbgen lightingDiffuse } } + vehicles/tracercore { surfaceparm nonsolid surfaceparm nolightmap deformVertexes autosprite { - map models/vehicles/tracercore.tga + map models/vehicles/tracercore.tga blendfunc add rgbGen lightingDiffuse } - } +} + vehicles/tracertrail { surfaceparm nonsolid @@ -45,4 +49,3 @@ vehicles/tracertrail rgbGen lightingDiffuse } } - diff --git a/scripts/weapons.shader b/scripts/weapons.shader index 85f27d5c0..e2df34813 100644 --- a/scripts/weapons.shader +++ b/scripts/weapons.shader @@ -75,7 +75,7 @@ minelayer { dpreflectcube cubemaps/default/sky { - map textures/minelayer.tga + map textures/minelayer.tga rgbgen lightingDiffuse } }