X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=d839057b0681b9fb55ef111004937a5897b29db7;hb=1fd8c1270358f7f49d7000bd2ee8a56042a24baf;hp=a565400728053bd11311a9da11973237f67f9190;hpb=a0db60e28809c5d2e8898c61a765f3fc9dadca5d;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index a5654007..d839057b 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -89,32 +89,9 @@ static void R_DrawSpriteImage (int additive, mspriteframe_t *frame, int texture,
 	m.tex[0] = texture;
 	R_Mesh_State(&m);
 
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = red * r_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = green * r_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = blue * r_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;
+	GL_Color(red * r_colorscale, green * r_colorscale, blue * r_colorscale, alpha);
 	// 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, polygonelements);
+	R_DrawSpriteMesh(origin, left, up, frame->left, frame->right, frame->down, frame->up);
 }
 
 void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
@@ -171,12 +148,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 #endif
 }
 
-/*
-=================
-R_DrawSpriteModel
-=================
-*/
-void R_DrawSpriteModel (entity_render_t *ent)
+void R_Model_Sprite_Draw(entity_render_t *ent)
 {
 	if (ent->frameblend[0].frame < 0)
 		return;