X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=d9d802486d79312a833787bb438e91e59af973ef;hb=19fc2b9ed255622fe0bad9841c9fd0b7383988d7;hp=58dd2d21d6a4d0a1eec689dd140bfd00d5d3817a;hpb=5715fdeb47caa02252ab9b6c0895310e43bea716;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 58dd2d21..d9d80248 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -1,8 +1,6 @@
 
 #include "quakedef.h"
 
-#define LERPSPRITES
-
 static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], float left[3], float up[3])
 {
 	float matrix1[3][3], matrix2[3][3], matrix3[3][3];
@@ -78,76 +76,32 @@ 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)
 {
-	rmeshbufferinfo_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.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();
-	}
+	// FIXME: negate left and right in loader
+	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;
-	vec3_t left, up, org, color;
+	int i;
+	vec3_t left, up, org, color, diffusecolor, diffusenormal;
 	mspriteframe_t *frame;
 	vec3_t diff;
 	float fog, ifog;
 
-	if (R_SpriteSetup(ent, ent->model->sprnum_type, org, left, up))
+	if (R_SpriteSetup(ent, ent->model->sprite.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;
-		wantoverbright = false;
-	}
 	else
 	{
-		R_CompleteLightPoint(color, ent->origin, true, NULL);
-		wantoverbright = color[0] > 1 || color[1] > 1 || color[2] > 1;
+		R_CompleteLightPoint(color, diffusecolor, diffusenormal, ent->origin, true, NULL);
+		VectorMA(color, 0.5f, diffusecolor, color);
 	}
 
 	if (fogenabled)
@@ -161,36 +115,34 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 		fog = 0;
 	ifog = 1 - fog;
 
-#ifdef LERPSPRITES
-	// LordHavoc: interpolated sprite rendering
-	for (i = 0;i < 4;i++)
+	if (r_lerpsprites.integer)
 	{
-		if (ent->frameblend[i].lerp >= 0.01f)
+		// LordHavoc: interpolated sprite rendering
+		for (i = 0;i < 4;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 * 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);
+			if (ent->frameblend[i].lerp >= 0.01f)
+			{
+				frame = ent->model->sprite.sprdata_frames + ent->frameblend[i].frame;
+				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(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
+			}
 		}
 	}
-#else
-	// LordHavoc: no interpolation
-	frame = NULL;
-	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);
-	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);
-#endif
+	else
+	{
+		// LordHavoc: no interpolation
+		frame = NULL;
+		for (i = 0;i < 4 && ent->frameblend[i].lerp;i++)
+			frame = ent->model->sprite.sprdata_frames + ent->frameblend[i].frame;
+
+		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(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+	}
 }
 
-/*
-=================
-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;