From: Rudolf Polzer Date: Sat, 3 Sep 2011 11:23:23 +0000 (+0200) Subject: fix blendfunc add use X-Git-Tag: xonotic-v0.5.0~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e05f2e15d78c6b58a42422b4a69230b282b5b638;p=xonotic%2Fxonotic-data.pk3dir.git fix blendfunc add use --- diff --git a/scripts/flags.shader b/scripts/flags.shader deleted file mode 100644 index 1ed38d6cc..000000000 --- a/scripts/flags.shader +++ /dev/null @@ -1,33 +0,0 @@ -flags/flag_red_cloth { - cull none - deformVertexes wave 100 sin 0 0.4 0 2.5 - { - map textures/flags/flag_red_cloth.tga - } -} - -flags/flag_red_laser { - { - map textures/flags/flag_red_laser.tga - tcMod scroll 0.2 -1 - blendfunc add - } -} - - -flags/flag_blue_cloth { - cull none - deformVertexes wave 100 sin 0 0.4 0 2.5 - { - map textures/flags/flag_blue_cloth.tga - } -} - -flags/flag_blue_laser { - { - map textures/flags/flag_blue_laser.tga - tcMod scroll 0.2 -1 - blendfunc add - } -} - diff --git a/scripts/projectiles.shader b/scripts/projectiles.shader index 28b1e9492..16847e57d 100644 --- a/scripts/projectiles.shader +++ b/scripts/projectiles.shader @@ -5,7 +5,7 @@ crylink_projectile_core deformVertexes autosprite { map textures/projectiles/crylink_projectile_core.tga - blendfunc add + blendfunc GL_SRC_ALPHA GL_ONE rgbGen lightingDiffuse } } @@ -16,7 +16,7 @@ crylink_projectile_long deformVertexes autosprite2 { map textures/projectiles/crylink_projectile_long.tga - blendfunc add + blendfunc GL_SRC_ALPHA GL_ONE rgbGen lightingDiffuse } } @@ -87,4 +87,4 @@ laser_projectile_long blendfunc add rgbGen lightingDiffuse } -} \ No newline at end of file +} diff --git a/scripts/relics.shader b/scripts/relics.shader index dd8372f1a..24f95617f 100644 --- a/scripts/relics.shader +++ b/scripts/relics.shader @@ -10,7 +10,7 @@ models/relics/relic_ring { { map models/relics/relic_ring.tga - blendfunc add + blendfunc GL_SRC_ALPHA GL_ONE rgbgen lightingDiffuse } } diff --git a/scripts/rocket.shader b/scripts/rocket.shader index b3041f215..a5c9d181d 100644 --- a/scripts/rocket.shader +++ b/scripts/rocket.shader @@ -4,7 +4,7 @@ rocketThrust cull disable { clampmap textures/thrustc1.tga - blendfunc add + blendfunc GL_SRC_ALPHA GL_ONE tcMod rotate 720 } } diff --git a/scripts/turrets.shader b/scripts/turrets.shader index 9e4f68e3f..006f67dd3 100644 --- a/scripts/turrets.shader +++ b/scripts/turrets.shader @@ -22,7 +22,7 @@ models/turrets/phaser_beam qer_editorimage models/turrets/phaser_beam { map models/turrets/phaser_beam - blendFunc add + blendFunc GL_SRC_ALPHA GL_ONE } } diff --git a/scripts/vehicles.shader b/scripts/vehicles.shader index 023e277aa..2d4d60675 100644 --- a/scripts/vehicles.shader +++ b/scripts/vehicles.shader @@ -41,8 +41,8 @@ vehicles/tracertrail deformVertexes autosprite2 { map models/vehicles/tracertrail.tga - blendfunc add + blendfunc GL_SRC_ALPHA GL_ONE rgbGen lightingDiffuse } } - \ No newline at end of file +