X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=47e9fb2051e1568279bc36768941b428426925a2;hb=1a8302a36c20462ad118f0fa9b71072c11c6b0a2;hp=577102632daff86deb88d3d202a1fcf72e99766f;hpb=fedb845e665b669ff11df23ce713842bd89c4ec4;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 57710263..47e9fb20 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -78,56 +78,16 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
 	return false;
 }
 
-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)
+static void R_DrawSpriteImage (int additive, mspriteframe_t *frame, rtexture_t *texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
 {
-	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.wantoverbright = wantoverbright;
-	m.tex[0] = texture;
-	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);
+	R_DrawSprite(GL_SRC_ALPHA, additive ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, texture, false, origin, left, up, frame->left, frame->right, frame->down, frame->up, red, green, blue, alpha);
 }
 
 void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 {
 	const entity_render_t *ent = calldata1;
-	int i, wantoverbright;
+	int i;
 	vec3_t left, up, org, color;
 	mspriteframe_t *frame;
 	vec3_t diff;
@@ -139,15 +99,9 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 	R_Mesh_Matrix(&r_identitymatrix);
 
 	if ((ent->model->flags & EF_FULLBRIGHT) || (ent->effects & EF_FULLBRIGHT))
-	{
 		color[0] = color[1] = color[2] = 1;
-		wantoverbright = false;
-	}
 	else
-	{
 		R_CompleteLightPoint(color, ent->origin, true, NULL);
-		wantoverbright = color[0] > 1 || color[1] > 1 || color[2] > 1;
-	}
 
 	if (fogenabled)
 	{
@@ -167,9 +121,9 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 		if (ent->frameblend[i].lerp >= 0.01f)
 		{
 			frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
-			R_DrawSpriteImage(wantoverbright, (ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, R_GetTexture(frame->texture), org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha * ent->frameblend[i].lerp);
+			R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, frame->texture, org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha * ent->frameblend[i].lerp);
 			if (fog * ent->frameblend[i].lerp >= 0.01f)
-				R_DrawSpriteImage(false, true, frame, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
+				R_DrawSpriteImage(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
 		}
 	}
 #else
@@ -178,18 +132,13 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 	for (i = 0;i < 4 && ent->frameblend[i].lerp;i++)
 		frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
 
-	R_DrawSpriteImage(wantoverbright, (ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, R_GetTexture(frame->texture), org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha);
+	R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, frame->texture, org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha);
 	if (fog * ent->frameblend[i].lerp >= 0.01f)
-		R_DrawSpriteImage(false, true, frame, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+		R_DrawSpriteImage(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
 #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;