From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 3 Sep 2011 11:10:38 +0000 (+0200)
Subject: fix some shader bugs
X-Git-Tag: xonotic-v0.5.0~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbbfeb765b25d5b2ce55829ca86e758b4f89fc35;p=xonotic%2Fxonotic-maps.pk3dir.git
fix some shader bugs
---
diff --git a/scripts/effects_beam.shader b/scripts/effects_beam.shader
index 7d16df52..f6f1ee70 100644
--- a/scripts/effects_beam.shader
+++ b/scripts/effects_beam.shader
@@ -6,7 +6,7 @@ textures/effects_beam/beam-blue
q3map_surfacelight 3000
{
map textures/effects_beam/beam-blue.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -18,7 +18,7 @@ textures/effects_beam/beam-purple
q3map_surfacelight 3000
{
map textures/effects_beam/beam-purple.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -30,7 +30,7 @@ textures/effects_beam/beam-red
q3map_surfacelight 3000
{
map textures/effects_beam/beam-red.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -42,7 +42,7 @@ textures/effects_beam/beam-green
q3map_surfacelight 3000
{
map textures/effects_beam/beam-green.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -54,6 +54,6 @@ textures/effects_beam/beam-yellow
q3map_surfacelight 3000
{
map textures/effects_beam/beam-yellow.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
diff --git a/scripts/effects_healpod.shader b/scripts/effects_healpod.shader
index 525a4d59..14694347 100644
--- a/scripts/effects_healpod.shader
+++ b/scripts/effects_healpod.shader
@@ -11,7 +11,7 @@ textures/effects_healpod/healpod1_d
qer_trans 0.6
{
map textures/effects_healpod/healpod1_d.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 2
}
}
diff --git a/scripts/effects_jumppad.shader b/scripts/effects_jumppad.shader
index 211eef33..30eaf657 100644
--- a/scripts/effects_jumppad.shader
+++ b/scripts/effects_jumppad.shader
@@ -10,7 +10,7 @@ textures/effects_jumppad/jumppadfx1_a
qer_trans 0.6
{
map textures/effects_jumppad/jumppadfx1_a.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 2
}
}
@@ -26,7 +26,7 @@ textures/effects_jumppad/jumppadfx1_b
qer_trans 0.6
{
map textures/effects_jumppad/jumppadfx1_b.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 2
}
}
@@ -42,7 +42,7 @@ textures/effects_jumppad/jumppadfx1_c
qer_trans 0.6
{
map textures/effects_jumppad/jumppadfx1_c.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 2
}
}
@@ -58,7 +58,7 @@ textures/effects_jumppad/jumppadfx1_d
qer_trans 0.6
{
map textures/effects_jumppad/jumppadfx1_d.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 2
}
}
diff --git a/scripts/effects_warpzone.shader b/scripts/effects_warpzone.shader
index 1e89243e..ebb9d26d 100644
--- a/scripts/effects_warpzone.shader
+++ b/scripts/effects_warpzone.shader
@@ -22,7 +22,7 @@ textures/effects_warpzone/blueedge
cull none
{
map textures/effects_warpzone/blueedge.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -34,7 +34,7 @@ textures/effects_warpzone/rededge
cull none
{
map textures/effects_warpzone/rededge.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index 5d3f2d79..036be232 100644
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -11,7 +11,7 @@ textures/liquids_lava/lava0
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -26,7 +26,7 @@ textures/liquids_lava/lava0_flow
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 -0.25
}
}
@@ -44,7 +44,7 @@ textures/liquids_lava/lava0_blue
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_blue.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -59,7 +59,7 @@ textures/liquids_lava/lava0_blue_flow
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_blue.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 -0.25
}
}
@@ -77,7 +77,7 @@ textures/liquids_lava/lava0_green
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_green.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -92,7 +92,7 @@ textures/liquids_lava/lava0_green_flow
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_green.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 -0.25
}
}
@@ -110,7 +110,7 @@ textures/liquids_lava/lava0_purple
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_purple.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
}
}
@@ -125,7 +125,7 @@ textures/liquids_lava/lava0_purple_flow
q3map_lightSubdivide 64
{
map textures/liquids_lava/lava0_purple.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
tcMod scroll 0 -0.25
}
}
diff --git a/scripts/logos.shader b/scripts/logos.shader
index a43ed83a..8028e04c 100644
--- a/scripts/logos.shader
+++ b/scripts/logos.shader
@@ -34,7 +34,7 @@ textures/logos/logo01_blue_glowy
{
map textures/logos/logo01/logo01_blueg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -76,7 +76,7 @@ textures/logos/logo01_red_glowy
{
map textures/logos/logo01/logo01_redg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -118,7 +118,7 @@ textures/logos/logo01_green_glowy
{
map textures/logos/logo01/logo01_greeng.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -160,7 +160,7 @@ textures/logos/logo01_yellow_glowy
{
map textures/logos/logo01/logo01_yellowg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -202,7 +202,7 @@ textures/logos/logo02_red_glowy
{
map textures/logos/logo02/logo02_redg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -244,7 +244,7 @@ textures/logos/logo02_blue_glowy
{
map textures/logos/logo02/logo02_blueg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -286,7 +286,7 @@ textures/logos/logo02_green_glowy
{
map textures/logos/logo02/logo02_greeng.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
@@ -328,8 +328,8 @@ textures/logos/logo02_yellow_glowy
{
map textures/logos/logo02/logo02_yellowg.tga
- blendFunc add
+ blendFunc GL_SRC_ALPHA GL_ONE
alphaFunc GT0
rgbgen identity
}
-}
\ No newline at end of file
+}
diff --git a/scripts/map_leave_em_behind.shader b/scripts/map_leave_em_behind.shader
index 6a39b031..5e24f756 100644
--- a/scripts/map_leave_em_behind.shader
+++ b/scripts/map_leave_em_behind.shader
@@ -13,7 +13,6 @@ textures/map_leave_em_behind/biolumi2_yellow
{
tcMod scroll 0 0.05
map textures/map_leave_em_behind/biolumi2_yellow.tga
- blendfunc blend
}
}
textures/map_leave_em_behind/biolumi2_green
@@ -31,7 +30,6 @@ textures/map_leave_em_behind/biolumi2_green
{
tcMod scroll 0 0.05
map textures/map_leave_em_behind/biolumi2_green.tga
- blendfunc blend
}
}
diff --git a/scripts/model_teleporters.shader b/scripts/model_teleporters.shader
index 98222135..7633f21b 100644
--- a/scripts/model_teleporters.shader
+++ b/scripts/model_teleporters.shader
@@ -4,7 +4,7 @@ models/teleporters/thrust
cull none
{
map models/teleporters/thrust.tga
- blendfunc add
+ blendfunc GL_SRC_ALPHA GL_ONE
rgbGen vertex
}
-}
\ No newline at end of file
+}