X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sprites.c;h=1b728f561ba31daa1d096de0fbfa663799abd674;hp=e7f561179493f4903c9ab1d5bd13e1808995af2d;hb=174d8329f84ed718f848273e1e730c60b6d93a28;hpb=8468ffaf8162a4fe8361127385c40141c375661d

diff --git a/r_sprites.c b/r_sprites.c
index e7f56117..1b728f56 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -1,151 +1,105 @@
+
 #include "quakedef.h"
+#include "r_shadow.h"
 
-void R_ClipSpriteImage (entity_t *e, msprite_t *psprite, frameblend_t *blend, vec3_t origin, vec3_t up, vec3_t right)
+void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
 	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++)
+	model_t *model = ent->model;
+	vec3_t left, up, org, color, diffusecolor, diffusenormal, mforward, mleft, mup;
+	float scale;
+
+	// nudge it toward the view to make sure it isn't in a wall
+	Matrix4x4_ToVectors(&ent->matrix, mforward, mleft, mup, org);
+	VectorSubtract(org, r_view.forward, org);
+	switch(model->sprite.sprnum_type)
 	{
-		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   );
+	case SPR_VP_PARALLEL_UPRIGHT:
+		// flames and such
+		// vertical beam sprite, faces view plane
+		scale = ent->scale / sqrt(r_view.forward[0]*r_view.forward[0]+r_view.forward[1]*r_view.forward[1]);
+		left[0] = -r_view.forward[1] * scale;
+		left[1] = r_view.forward[0] * scale;
+		left[2] = 0;
+		up[0] = 0;
+		up[1] = 0;
+		up[2] = ent->scale;
+		break;
+	case SPR_FACING_UPRIGHT:
+		// flames and such
+		// vertical beam sprite, faces viewer's origin (not the view plane)
+		scale = ent->scale / sqrt((org[0] - r_view.origin[0])*(org[0] - r_view.origin[0])+(org[1] - r_view.origin[1])*(org[1] - r_view.origin[1]));
+		left[0] = (org[1] - r_view.origin[1]) * scale;
+		left[1] = -(org[0] - r_view.origin[0]) * scale;
+		left[2] = 0;
+		up[0] = 0;
+		up[1] = 0;
+		up[2] = ent->scale;
+		break;
+	default:
+		Con_Printf("R_SpriteSetup: unknown sprite type %i\n", model->sprite.sprnum_type);
+		// fall through to normal sprite
+	case SPR_VP_PARALLEL:
+		// normal sprite
+		// faces view plane
+		VectorScale(r_view.left, ent->scale, left);
+		VectorScale(r_view.up, ent->scale, up);
+		break;
+	case SPR_ORIENTED:
+		// bullet marks on walls
+		// ignores viewer entirely
+		VectorCopy(mleft, left);
+		VectorCopy(mup, up);
+		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
+		left[0] = mleft[0] * r_view.forward[0] + mleft[1] * r_view.left[0] + mleft[2] * r_view.up[0];
+		left[1] = mleft[0] * r_view.forward[1] + mleft[1] * r_view.left[1] + mleft[2] * r_view.up[1];
+		left[2] = mleft[0] * r_view.forward[2] + mleft[1] * r_view.left[2] + mleft[2] * r_view.up[2];
+		up[0] = mup[0] * r_view.forward[0] + mup[1] * r_view.left[0] + mup[2] * r_view.up[0];
+		up[1] = mup[0] * r_view.forward[1] + mup[1] * r_view.left[1] + mup[2] * r_view.up[1];
+		up[2] = mup[0] * r_view.forward[2] + mup[1] * r_view.left[2] + mup[2] * r_view.up[2];
+		break;
 	}
-	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);
-}
 
-void R_ClipSprite (entity_t *e, frameblend_t *blend)
-{
-	vec3_t forward, right, up, org;
-	msprite_t *psprite;
+	R_Mesh_Matrix(&identitymatrix);
 
-	if (!blend[0].lerp)
-		return;
-
-	psprite = Mod_Extradata(e->render.model);
-
-	if (psprite->type == SPR_ORIENTED)
-	{
-		// bullet marks on walls
-		AngleVectors (e->render.angles, forward, right, up);
-		// 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;
-	}
+	if (!(ent->flags & RENDER_LIGHT))
+		color[0] = color[1] = color[2] = 1;
 	else
 	{
-		// 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;
+		vec3_t org;
+		Matrix4x4_OriginFromMatrix(&ent->matrix, org);
+		R_CompleteLightPoint(color, diffusecolor, diffusenormal, org, true);
+		VectorMA(color, 0.5f, diffusecolor, color);
 	}
+	color[0] *= ent->colormod[0];
+	color[1] *= ent->colormod[1];
+	color[2] *= ent->colormod[2];
 
-
-	if (e->render.scale != 1)
+	// LordHavoc: interpolated sprite rendering
+	for (i = 0;i < 4;i++)
 	{
-		VectorScale(up, e->render.scale, up);
-		VectorScale(right, e->render.scale, right);
+		if (ent->frameblend[i].lerp >= 0.01f)
+		{
+			mspriteframe_t *frame = model->sprite.sprdata_frames + ent->frameblend[i].frame;
+			texture_t *texture = &frame->texture;
+			R_UpdateTextureInfo(ent, texture);
+			// FIXME: negate left and right in loader
+			R_DrawSprite(texture->currentlayers[0].blendfunc1, texture->currentlayers[0].blendfunc2, frame->texture.currentskinframe->base, frame->texture.currentskinframe->fog, (ent->effects & EF_NODEPTHTEST), org, left, up, frame->left, frame->right, frame->down, frame->up, color[0], color[1], color[2], ent->alpha * ent->frameblend[i].lerp);
+		}
 	}
-
-	// LordHavoc: interpolated sprite rendering
-	R_ClipSpriteImage(e, psprite, blend, org, up, right);
 }
 
-void GL_DrawSpriteImage (mspriteframe_t *frame, vec3_t origin, vec3_t up, vec3_t right, byte red, byte green, byte blue, int alpha)
+void R_Model_Sprite_Draw(entity_render_t *ent)
 {
-	byte alphaub;
-	alphaub = bound(0, alpha, 255);
-	transpolybegin(R_GetTexture(frame->texture), 0, R_GetTexture(frame->fogtexture), ((currententity->render.effects & EF_ADDITIVE) || (currententity->render.model->flags & 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();
-}
-
-/*
-=================
-R_DrawSpriteModel
-=================
-*/
-void R_DrawSpriteModel (entity_t *e, frameblend_t *blend)
-{
-	vec3_t		forward, right, up, org, color, mins, maxs;
-	byte		colorub[4];
-	msprite_t	*psprite;
-
-	if (!blend[0].lerp)
+	vec3_t org;
+	if (ent->frameblend[0].frame < 0)
 		return;
 
-	VectorAdd (e->render.origin, e->render.model->mins, mins);
-	VectorAdd (e->render.origin, e->render.model->maxs, maxs);
-
-//	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
-		AngleVectors (e->render.angles, forward, right, up);
-		VectorSubtract(e->render.origin, vpn, org);
-	}
-	else
-	{
-		// normal sprite
-		VectorCopy(vup, up);
-		VectorCopy(vright, right);
-		VectorCopy(e->render.origin, org);
-	}
-
-	if (e->render.scale != 1)
-	{
-		VectorScale(up, e->render.scale, up);
-		VectorScale(right, e->render.scale, right);
-	}
-
-	if (e->render.model->flags & EF_FULLBRIGHT || e->render.effects & EF_FULLBRIGHT)
-	{
-		color[0] = e->render.colormod[0] * 255;
-		color[1] = e->render.colormod[1] * 255;
-		color[2] = e->render.colormod[2] * 255;
-	}
-	else
-		R_CompleteLightPoint(color, e->render.origin, true);
-
-	colorub[0] = bound(0, color[0], 255);
-	colorub[1] = bound(0, color[1], 255);
-	colorub[2] = bound(0, color[2], 255);
-
-	// 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);
+	Matrix4x4_OriginFromMatrix(&ent->matrix, org);
+	R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_view.origin : org, R_Model_Sprite_Draw_TransparentCallback, ent, 0, r_shadow_rtlight);
 }