vertex arrays renamed to varray_ and exposed to rest of engine

[xonotic/darkplaces.git] / r_light.c

diff --git a/r_light.c b/r_light.c
index 754685ae7394306ac68afa04dd24863976bf7784..11b4619b2d39653017e23da8835349d46f8a628e 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -140,7 +140,7 @@ void R_BuildLightList(void)
 void R_DrawCoronas(void)
 {
        int i;
-       rmeshbufferinfo_t m;
+       rmeshstate_t m;
        float scale, viewdist, diff[3], dist;
        rdlight_t *rd;
        if (!r_coronas.integer)
@@ -148,66 +148,60 @@ void R_DrawCoronas(void)
        memset(&m, 0, sizeof(m));
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ONE;
+       m.wantoverbright = false;
        m.depthdisable = true; // magic
-       m.numtriangles = 2;
-       m.numverts = 4;
        m.tex[0] = R_GetTexture(lightcorona);
+       Matrix4x4_CreateIdentity(&m.matrix);
+       R_Mesh_State(&m);
        viewdist = DotProduct(r_origin, vpn);
        for (i = 0;i < r_numdlights;i++)
        {
                rd = r_dlight + i;
                dist = (DotProduct(rd->origin, vpn) - viewdist);
-               if (dist >= 24.0f)
+               if (dist >= 24.0f && CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true) == 1)
                {
-                       if (CL_TraceLine(rd->origin, r_origin, NULL, NULL, 0, true) == 1)
+                       scale = mesh_colorscale * (1.0f / 131072.0f);
+                       if (gl_flashblend.integer)
+                               scale *= 4.0f;
+                       if (fogenabled)
                        {
-                               Matrix4x4_CreateIdentity(&m.matrix);
-                               if (R_Mesh_Draw_GetBuffer(&m, false))
-                               {
-                                       scale = m.colorscale * (1.0f / 131072.0f);
-                                       if (gl_flashblend.integer)
-                                               scale *= 4.0f;
-                                       if (fogenabled)
-                                       {
-                                               VectorSubtract(rd->origin, r_origin, diff);
-                                               scale *= 1 - exp(fogdensity/DotProduct(diff,diff));
-                                       }
-                                       m.index[0] = 0;
-                                       m.index[1] = 1;
-                                       m.index[2] = 2;
-                                       m.index[3] = 0;
-                                       m.index[4] = 2;
-                                       m.index[5] = 3;
-                                       m.color[0] = m.color[4] = m.color[8] = m.color[12] = rd->light[0] * scale;
-                                       m.color[1] = m.color[5] = m.color[9] = m.color[13] = rd->light[1] * scale;
-                                       m.color[2] = m.color[6] = m.color[10] = m.color[14] = rd->light[2] * scale;
-                                       m.color[3] = m.color[7] = m.color[11] = m.color[15] = 1;
-                                       m.texcoords[0][0] = 0;
-                                       m.texcoords[0][1] = 0;
-                                       m.texcoords[0][2] = 0;
-                                       m.texcoords[0][3] = 1;
-                                       m.texcoords[0][4] = 1;
-                                       m.texcoords[0][5] = 1;
-                                       m.texcoords[0][6] = 1;
-                                       m.texcoords[0][7] = 0;
-                                       scale = rd->cullradius * 0.25f;
-                                       if (gl_flashblend.integer)
-                                               scale *= 2.0f;
-                                       m.vertex[0] = rd->origin[0] - vright[0] * scale - vup[0] * scale;
-                                       m.vertex[1] = rd->origin[1] - vright[1] * scale - vup[1] * scale;
-                                       m.vertex[2] = rd->origin[2] - vright[2] * scale - vup[2] * scale;
-                                       m.vertex[4] = rd->origin[0] - vright[0] * scale + vup[0] * scale;
-                                       m.vertex[5] = rd->origin[1] - vright[1] * scale + vup[1] * scale;
-                                       m.vertex[6] = rd->origin[2] - vright[2] * scale + vup[2] * scale;
-                                       m.vertex[8] = rd->origin[0] + vright[0] * scale + vup[0] * scale;
-                                       m.vertex[9] = rd->origin[1] + vright[1] * scale + vup[1] * scale;
-                                       m.vertex[10] = rd->origin[2] + vright[2] * scale + vup[2] * scale;
-                                       m.vertex[12] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
-                                       m.vertex[13] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
-                                       m.vertex[14] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
-                                       R_Mesh_Render();
-                               }
+                               VectorSubtract(rd->origin, r_origin, diff);
+                               scale *= 1 - exp(fogdensity/DotProduct(diff,diff));
                        }
+                       varray_element[0] = 0;
+                       varray_element[1] = 1;
+                       varray_element[2] = 2;
+                       varray_element[3] = 0;
+                       varray_element[4] = 2;
+                       varray_element[5] = 3;
+                       varray_color[ 0] = varray_color[ 4] = varray_color[ 8] = varray_color[12] = rd->light[0] * scale;
+                       varray_color[ 1] = varray_color[ 5] = varray_color[ 9] = varray_color[13] = rd->light[1] * scale;
+                       varray_color[ 2] = varray_color[ 6] = varray_color[10] = varray_color[14] = rd->light[2] * scale;
+                       varray_color[ 3] = varray_color[ 7] = varray_color[11] = varray_color[15] = 1;
+                       varray_texcoord[0][0] = 0;
+                       varray_texcoord[0][1] = 0;
+                       varray_texcoord[0][2] = 0;
+                       varray_texcoord[0][3] = 1;
+                       varray_texcoord[0][4] = 1;
+                       varray_texcoord[0][5] = 1;
+                       varray_texcoord[0][6] = 1;
+                       varray_texcoord[0][7] = 0;
+                       scale = rd->cullradius * 0.25f;
+                       if (gl_flashblend.integer)
+                               scale *= 2.0f;
+                       varray_vertex[0] = rd->origin[0] - vright[0] * scale - vup[0] * scale;
+                       varray_vertex[1] = rd->origin[1] - vright[1] * scale - vup[1] * scale;
+                       varray_vertex[2] = rd->origin[2] - vright[2] * scale - vup[2] * scale;
+                       varray_vertex[4] = rd->origin[0] - vright[0] * scale + vup[0] * scale;
+                       varray_vertex[5] = rd->origin[1] - vright[1] * scale + vup[1] * scale;
+                       varray_vertex[6] = rd->origin[2] - vright[2] * scale + vup[2] * scale;
+                       varray_vertex[8] = rd->origin[0] + vright[0] * scale + vup[0] * scale;
+                       varray_vertex[9] = rd->origin[1] + vright[1] * scale + vup[1] * scale;
+                       varray_vertex[10] = rd->origin[2] + vright[2] * scale + vup[2] * scale;
+                       varray_vertex[12] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
+                       varray_vertex[13] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
+                       varray_vertex[14] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
+                       R_Mesh_Draw(4, 2);
                }
        }
 }