fix some shader bugs
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 11:10:38 +0000 (13:10 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 11:10:38 +0000 (13:10 +0200)
scripts/effects_beam.shader
scripts/effects_healpod.shader
scripts/effects_jumppad.shader
scripts/effects_warpzone.shader
scripts/liquids_lava.shader
scripts/logos.shader
scripts/map_leave_em_behind.shader
scripts/model_teleporters.shader

index 7d16df5..f6f1ee7 100644 (file)
@@ -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
        }
 }
index 525a4d5..1469434 100644 (file)
@@ -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
        }
 }
index 211eef3..30eaf65 100644 (file)
@@ -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
        }
 }
index 1e89243..ebb9d26 100644 (file)
@@ -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
        }
 }
 
index 5d3f2d7..036be23 100644 (file)
@@ -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
        }
 }
index a43ed83..8028e04 100644 (file)
@@ -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
+}
index 6a39b03..5e24f75 100644 (file)
@@ -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
        }
 
 }
index 9822213..7633f21 100644 (file)
@@ -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
+}