X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=d839057b0681b9fb55ef111004937a5897b29db7;hb=c8630f49b9fe6321ff9778ea79bd062d812e513d;hp=27da0a66d4b4b832d99dd3e2ace2e473296d9a48;hpb=7d0ec7ce187f7333a7ada2884108757a4fec6449;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 27da0a66..d839057b 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -1,153 +1,160 @@
+
 #include "quakedef.h"
 
-void R_ClipSpriteImage (entity_t *e, msprite_t *psprite, frameblend_t *blend, vec3_t origin, vec3_t up, vec3_t right)
-{
-	int i;
-	mspriteframe_t *frame;
-	vec3_t points[4];
-	float fleft, fright, fdown, fup;
-	frame = ((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[0].frame;
-	fleft  = frame->left;
-	fdown  = frame->down;
-	fright = frame->right;
-	fup    = frame->up;
-	for (i = 1;i < 4 && blend[i].lerp;i++)
-	{
-		frame = ((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[i].frame;
-		fleft  = min(fleft , frame->left );
-		fdown  = min(fdown , frame->down );
-		fright = max(fright, frame->right);
-		fup    = max(fup   , frame->up   );
-	}
-	points[0][0] = origin[0] + fdown * up[0] + fleft  * right[0];points[0][1] = origin[1] + fdown * up[1] + fleft  * right[1];points[0][2] = origin[2] + fdown * up[2] + fleft  * right[2];
-	points[1][0] = origin[0] + fup   * up[0] + fleft  * right[0];points[1][1] = origin[1] + fup   * up[1] + fleft  * right[1];points[1][2] = origin[2] + fup   * up[2] + fleft  * right[2];
-	points[2][0] = origin[0] + fup   * up[0] + fright * right[0];points[2][1] = origin[1] + fup   * up[1] + fright * right[1];points[2][2] = origin[2] + fup   * up[2] + fright * right[2];
-	points[3][0] = origin[0] + fdown * up[0] + fright * right[0];points[3][1] = origin[1] + fdown * up[1] + fright * right[1];points[3][2] = origin[2] + fdown * up[2] + fright * right[2];
-	R_Clip_AddPolygon(&points[0][0], 4, sizeof(float[3]), false, R_Entity_Callback, e, NULL, NULL);
-}
+#define LERPSPRITES
 
-void R_ClipSprite (entity_t *e, frameblend_t *blend)
+static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], float left[3], float up[3])
 {
-	vec3_t right, up, org;
-	msprite_t *psprite;
-
-	if (!blend[0].lerp)
-		return;
+	float matrix1[3][3], matrix2[3][3], matrix3[3][3];
 
-	psprite = Mod_Extradata(e->render.model);
-
-	if (psprite->type == SPR_ORIENTED)
+	VectorCopy(ent->origin, org);
+	switch(type)
 	{
+	case SPR_VP_PARALLEL_UPRIGHT:
+		// flames and such
+		// vertical beam sprite, faces view plane
+		VectorNegate(vpn, matrix3[0]);
+		matrix3[0][2] = 0;
+		VectorNormalizeFast(matrix3[0]);
+		matrix3[1][0] = matrix3[0][1];
+		matrix3[1][1] = -matrix3[0][0];
+		matrix3[1][2] = 0;
+		matrix3[2][0] = 0;
+		matrix3[2][1] = 0;
+		matrix3[2][2] = 1;
+		break;
+	case SPR_FACING_UPRIGHT:
+		// flames and such
+		// vertical beam sprite, faces viewer's origin (not the view plane)
+		VectorSubtract(ent->origin, r_origin, matrix3[0]);
+		matrix3[0][2] = 0;
+		VectorNormalizeFast(matrix3[0]);
+		matrix3[1][0] = matrix3[0][1];
+		matrix3[1][1] = -matrix3[0][0];
+		matrix3[1][2] = 0;
+		matrix3[2][0] = 0;
+		matrix3[2][1] = 0;
+		matrix3[2][2] = 1;
+		break;
+	default:
+		Con_Printf("R_SpriteSetup: unknown sprite type %i\n", type);
+		// fall through to normal sprite
+	case SPR_VP_PARALLEL:
+		// normal sprite
+		// faces view plane
+		VectorCopy(vpn, matrix3[0]);
+		VectorNegate(vright, matrix3[1]);
+		VectorCopy(vup, matrix3[2]);
+		break;
+	case SPR_ORIENTED:
 		// bullet marks on walls
-		vec3_t forward;
-		AngleVectors (e->render.angles, forward, right, up);
+		// ignores viewer entirely
+		AngleVectorsFLU (ent->angles, matrix3[0], matrix3[1], matrix3[2]);
 		// nudge it toward the view, so it will be infront of the wall
-		VectorSubtract(e->render.origin, vpn, org);
-		// don't draw if it's a backface
-		if (DotProduct(r_origin, forward) < (DotProduct(org, forward) + 1.0f))
-			return;
+		VectorSubtract(org, vpn, org);
+		break;
+	case SPR_VP_PARALLEL_ORIENTED:
+		// I have no idea what people would use this for
+		// oriented relative to view space
+		// FIXME: test this and make sure it mimicks software
+		AngleVectorsFLU (ent->angles, matrix1[0], matrix1[1], matrix1[2]);
+		VectorCopy(vpn, matrix2[0]);
+		VectorNegate(vright, matrix2[1]);
+		VectorCopy(vup, matrix2[2]);
+		R_ConcatRotations (matrix1[0], matrix2[0], matrix3[0]);
+		break;
 	}
-	else
+
+	if (ent->scale != 1)
 	{
-		// normal sprite
-		VectorCopy(vup, up);
-		VectorCopy(vright, right);
-		VectorCopy(e->render.origin, org);
-		// don't draw if it's a backface
-		if (DotProduct(org, vpn) < (DotProduct(r_origin, vpn) + 1.0f))
-			return;
+		VectorScale(matrix3[1], ent->scale, left);
+		VectorScale(matrix3[2], ent->scale, up);
 	}
-
-
-	if (e->render.scale != 1)
+	else
 	{
-		VectorScale(up, e->render.scale, up);
-		VectorScale(right, e->render.scale, right);
+		VectorCopy(matrix3[1], left);
+		VectorCopy(matrix3[2], up);
 	}
-
-	// LordHavoc: interpolated sprite rendering
-	R_ClipSpriteImage(e, psprite, blend, org, up, right);
+	return false;
 }
 
-void GL_DrawSpriteImage (mspriteframe_t *frame, vec3_t origin, vec3_t up, vec3_t right, byte red, byte green, byte blue, int alpha)
+static void R_DrawSpriteImage (int additive, mspriteframe_t *frame, int texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
 {
-	byte alphaub;
-	alphaub = bound(0, alpha, 255);
-	transpolybegin(R_GetTexture(frame->texture), 0, R_GetTexture(frame->fogtexture), currententity->render.effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA);
-	transpolyvertub(origin[0] + frame->down * up[0] + frame->left  * right[0], origin[1] + frame->down * up[1] + frame->left  * right[1], origin[2] + frame->down * up[2] + frame->left  * right[2], 0, 1, red, green, blue, alphaub);
-	transpolyvertub(origin[0] + frame->up   * up[0] + frame->left  * right[0], origin[1] + frame->up   * up[1] + frame->left  * right[1], origin[2] + frame->up   * up[2] + frame->left  * right[2], 0, 0, red, green, blue, alphaub);
-	transpolyvertub(origin[0] + frame->up   * up[0] + frame->right * right[0], origin[1] + frame->up   * up[1] + frame->right * right[1], origin[2] + frame->up   * up[2] + frame->right * right[2], 1, 0, red, green, blue, alphaub);
-	transpolyvertub(origin[0] + frame->down * up[0] + frame->right * right[0], origin[1] + frame->down * up[1] + frame->right * right[1], origin[2] + frame->down * up[2] + frame->right * right[2], 1, 1, red, green, blue, alphaub);
-	transpolyend();
+	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.tex[0] = texture;
+	R_Mesh_State(&m);
+
+	GL_Color(red * r_colorscale, green * r_colorscale, blue * r_colorscale, alpha);
+	// FIXME: negate left and right in loader
+	R_DrawSpriteMesh(origin, left, up, frame->left, frame->right, frame->down, frame->up);
 }
 
-/*
-=================
-R_DrawSpriteModel
-=================
-*/
-void R_DrawSpriteModel (entity_t *e, frameblend_t *blend)
+void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 {
-	vec3_t		right, up, org, color, mins, maxs;
-	byte		colorub[4];
-	msprite_t	*psprite;
+	const entity_render_t *ent = calldata1;
+	int i;
+	vec3_t left, up, org, color;
+	mspriteframe_t *frame;
+	vec3_t diff;
+	float fog, ifog;
 
-	if (!blend[0].lerp)
+	if (R_SpriteSetup(ent, ent->model->sprnum_type, org, left, up))
 		return;
 
-	VectorAdd (e->render.origin, e->render.model->mins, mins);
-	VectorAdd (e->render.origin, e->render.model->maxs, maxs);
+	R_Mesh_Matrix(&r_identitymatrix);
 
-//	if (R_CullBox (mins, maxs))
-//		return;
-
-	c_sprites++;
-
-	psprite = Mod_Extradata(e->render.model);
-	//psprite = e->model->cache.data;
-
-	if (psprite->type == SPR_ORIENTED)
-	{	// bullet marks on walls
-		vec3_t forward;
-		AngleVectors (e->render.angles, forward, right, up);
-		VectorSubtract(e->render.origin, vpn, org);
-		if (DotProduct(r_origin, forward) < DotProduct(e->render.origin, forward))
-			return; // backface
-	}
+	if ((ent->model->flags & EF_FULLBRIGHT) || (ent->effects & EF_FULLBRIGHT))
+		color[0] = color[1] = color[2] = 1;
 	else
-	{	// normal sprite
-		VectorCopy(vup, up);
-		VectorCopy(vright, right);
-		VectorCopy(e->render.origin, org);
-	}
+		R_CompleteLightPoint(color, ent->origin, true, NULL);
 
-	if (e->render.scale != 1)
+	if (fogenabled)
 	{
-		VectorScale(up, e->render.scale, up);
-		VectorScale(right, e->render.scale, right);
+		VectorSubtract(ent->origin, r_origin, diff);
+		fog = exp(fogdensity/DotProduct(diff,diff));
+		if (fog > 1)
+			fog = 1;
 	}
+	else
+		fog = 0;
+	ifog = 1 - fog;
 
-	if (e->render.model->flags & EF_FULLBRIGHT || e->render.effects & EF_FULLBRIGHT)
+#ifdef LERPSPRITES
+	// LordHavoc: interpolated sprite rendering
+	for (i = 0;i < 4;i++)
 	{
-		color[0] = e->render.colormod[0] * 255;
-		color[1] = e->render.colormod[1] * 255;
-		color[2] = e->render.colormod[2] * 255;
+		if (ent->frameblend[i].lerp >= 0.01f)
+		{
+			frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
+			R_DrawSpriteImage((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(true, frame, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
+		}
 	}
-	else
-		R_CompleteLightPoint(color, e->render.origin, true);
+#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((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(true, frame, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+#endif
+}
 
-	colorub[0] = bound(0, color[0], 255);
-	colorub[1] = bound(0, color[1], 255);
-	colorub[2] = bound(0, color[2], 255);
+void R_Model_Sprite_Draw(entity_render_t *ent)
+{
+	if (ent->frameblend[0].frame < 0)
+		return;
 
-	// LordHavoc: interpolated sprite rendering
-	if (blend[0].lerp)
-		GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[0].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[0].lerp);
-	if (blend[1].lerp)
-		GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[1].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[1].lerp);
-	if (blend[2].lerp)
-		GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[2].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[2].lerp);
-	if (blend[3].lerp)
-		GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[3].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[3].lerp);
+	c_sprites++;
+
+	R_MeshQueue_AddTransparent(ent->origin, R_DrawSpriteModelCallback, ent, 0);
 }