r_showsurfaces 3 "eeepc mode": support blend funcs

[xonotic/darkplaces.git] / r_lightning.c

diff --git a/r_lightning.c b/r_lightning.c
index 3ab8cb1c271298cef59de7979238d78c43e489d0..ee4cee39da77fe8bcfad2a46386d1d0c8989cfda 100644 (file)
--- a/r_lightning.c
+++ b/r_lightning.c
@@ -14,7 +14,7 @@ rtexture_t *r_lightningbeamtexture;
 rtexture_t *r_lightningbeamqmbtexture;
 rtexturepool_t *r_lightningbeamtexturepool;
 
-int r_lightningbeamelements[18] = {0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11};
+unsigned short r_lightningbeamelements[18] = {0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11};
 
 void r_lightningbeams_start(void)
 {
@@ -92,7 +92,7 @@ void r_lightningbeams_setuptexture(void)
                        if (px >= 0 && py >= 0 && px < BEAMWIDTH && py < BEAMHEIGHT)
                                image[py*BEAMWIDTH+px] += 16;
                }
-       
+
                for (py = 0;py < BEAMHEIGHT;py++)
                {
                        for (px = 0;px < BEAMWIDTH;px++)
@@ -103,7 +103,7 @@ void r_lightningbeams_setuptexture(void)
                                pixels[(py*BEAMWIDTH+px)*4+3] = 255;
                        }
                }
-       
+
                Image_WriteTGABGRA(va("lightningbeam%i.tga", imagenumber), BEAMWIDTH, BEAMHEIGHT, pixels);
        }
 
@@ -242,12 +242,14 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r
        GL_DepthRange(0, 1);
        GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
        GL_DepthTest(true);
+       GL_CullFace(GL_NONE);
        if (r_lightningbeam_qmbtexture.integer && r_lightningbeamqmbtexture == NULL)
                r_lightningbeams_setupqmbtexture();
        if (!r_lightningbeam_qmbtexture.integer && r_lightningbeamtexture == NULL)
                r_lightningbeams_setuptexture();
 
        R_Mesh_VertexPointer(vertex3f, 0, 0);
+       R_SetupGenericShader(true);
        // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
        if (r_refdef.fogenabled)
        {
@@ -337,7 +339,7 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r
 
                // draw the 3 polygons as one batch of 6 triangles using the 12 vertices
                GL_LockArrays(0, 12);
-               R_Mesh_Draw(0, 12, 6, r_lightningbeamelements, 0, 0);
+               R_Mesh_Draw(0, 12, 0, 6, NULL, r_lightningbeamelements, 0, 0);
                GL_LockArrays(0, 0);
        }
 }