transform matrix is now separate from R_Mesh_State, a new function called R_Mesh_Matr...

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index 58dd2d21d6a4d0a1eec689dd140bfd00d5d3817a..577102632daff86deb88d3d202a1fcf72e99766f 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -80,51 +80,48 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
 
 static void R_DrawSpriteImage (int wantoverbright, int additive, mspriteframe_t *frame, int texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
 {
-       rmeshbufferinfo_t m;
+       rmeshstate_t m;
        memset(&m, 0, sizeof(m));
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        if (additive)
                m.blendfunc2 = GL_ONE;
-       m.numtriangles = 2;
-       m.numverts = 4;
+       m.wantoverbright = wantoverbright;
        m.tex[0] = texture;
-       Matrix4x4_CreateIdentity(&m.matrix);
-       if (R_Mesh_Draw_GetBuffer(&m, wantoverbright))
-       {
-               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] = red * m.colorscale;
-               m.color[1] = m.color[5] = m.color[9] = m.color[13] = green * m.colorscale;
-               m.color[2] = m.color[6] = m.color[10] = m.color[14] = blue * m.colorscale;
-               m.color[3] = m.color[7] = m.color[11] = m.color[15] = alpha;
-               m.texcoords[0][0] = 0;
-               m.texcoords[0][1] = 1;
-               m.texcoords[0][2] = 0;
-               m.texcoords[0][3] = 0;
-               m.texcoords[0][4] = 1;
-               m.texcoords[0][5] = 0;
-               m.texcoords[0][6] = 1;
-               m.texcoords[0][7] = 1;
-               // FIXME: negate left and right in loader
-               m.vertex[0] = origin[0] + frame->down * up[0] - frame->left  * left[0];
-               m.vertex[1] = origin[1] + frame->down * up[1] - frame->left  * left[1];
-               m.vertex[2] = origin[2] + frame->down * up[2] - frame->left  * left[2];
-               m.vertex[4] = origin[0] + frame->up   * up[0] - frame->left  * left[0];
-               m.vertex[5] = origin[1] + frame->up   * up[1] - frame->left  * left[1];
-               m.vertex[6] = origin[2] + frame->up   * up[2] - frame->left  * left[2];
-               m.vertex[8] = origin[0] + frame->up   * up[0] - frame->right * left[0];
-               m.vertex[9] = origin[1] + frame->up   * up[1] - frame->right * left[1];
-               m.vertex[10] = origin[2] + frame->up   * up[2] - frame->right * left[2];
-               m.vertex[12] = origin[0] + frame->down * up[0] - frame->right * left[0];
-               m.vertex[13] = origin[1] + frame->down * up[1] - frame->right * left[1];
-               m.vertex[14] = origin[2] + frame->down * up[2] - frame->right * left[2];
-               R_Mesh_Render();
-       }
+       R_Mesh_State(&m);
+
+       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] = red * mesh_colorscale;
+       varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = green * mesh_colorscale;
+       varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = blue * mesh_colorscale;
+       varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = alpha;
+       varray_texcoord[0][0] = 0;
+       varray_texcoord[0][1] = 1;
+       varray_texcoord[0][2] = 0;
+       varray_texcoord[0][3] = 0;
+       varray_texcoord[0][4] = 1;
+       varray_texcoord[0][5] = 0;
+       varray_texcoord[0][6] = 1;
+       varray_texcoord[0][7] = 1;
+       // FIXME: negate left and right in loader
+       varray_vertex[0] = origin[0] + frame->down * up[0] - frame->left  * left[0];
+       varray_vertex[1] = origin[1] + frame->down * up[1] - frame->left  * left[1];
+       varray_vertex[2] = origin[2] + frame->down * up[2] - frame->left  * left[2];
+       varray_vertex[4] = origin[0] + frame->up   * up[0] - frame->left  * left[0];
+       varray_vertex[5] = origin[1] + frame->up   * up[1] - frame->left  * left[1];
+       varray_vertex[6] = origin[2] + frame->up   * up[2] - frame->left  * left[2];
+       varray_vertex[8] = origin[0] + frame->up   * up[0] - frame->right * left[0];
+       varray_vertex[9] = origin[1] + frame->up   * up[1] - frame->right * left[1];
+       varray_vertex[10] = origin[2] + frame->up   * up[2] - frame->right * left[2];
+       varray_vertex[12] = origin[0] + frame->down * up[0] - frame->right * left[0];
+       varray_vertex[13] = origin[1] + frame->down * up[1] - frame->right * left[1];
+       varray_vertex[14] = origin[2] + frame->down * up[2] - frame->right * left[2];
+       R_Mesh_Draw(4, 2);
 }
 
 void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
@@ -139,6 +136,8 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
        if (R_SpriteSetup(ent, ent->model->sprnum_type, org, left, up))
                return;
 
+       R_Mesh_Matrix(&r_identitymatrix);
+
        if ((ent->model->flags & EF_FULLBRIGHT) || (ent->effects & EF_FULLBRIGHT))
        {
                color[0] = color[1] = color[2] = 1;