X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=70169e1258e32855c793f0865e61ba937f1a4f1e;hb=0dd9156548a265ffaa349488bce0a5838500de67;hp=d215d4940556bc4f393b32a08d157b7fd5c7c934;hpb=a91c58e82c486825b0e7a2c400002a4cf80175de;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index d215d494..70169e12 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -1,15 +1,19 @@
 
 #include "quakedef.h"
+#include "r_shadow.h"
 
-static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], float left[3], float up[3])
+void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
 {
+	int i;
+	vec3_t left, up, org, color, diffusecolor, diffusenormal;
+	mspriteframe_t *frame;
 	float scale;
 
 	// nudge it toward the view to make sure it isn't in a wall
 	org[0] = ent->matrix.m[0][3] - r_viewforward[0];
 	org[1] = ent->matrix.m[1][3] - r_viewforward[1];
 	org[2] = ent->matrix.m[2][3] - r_viewforward[2];
-	switch(type)
+	switch(ent->model->sprite.sprnum_type)
 	{
 	case SPR_VP_PARALLEL_UPRIGHT:
 		// flames and such
@@ -34,7 +38,7 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
 		up[2] = ent->scale;
 		break;
 	default:
-		Con_Printf("R_SpriteSetup: unknown sprite type %i\n", type);
+		Con_Printf("R_SpriteSetup: unknown sprite type %i\n", ent->model->sprite.sprnum_type);
 		// fall through to normal sprite
 	case SPR_VP_PARALLEL:
 		// normal sprite
@@ -68,74 +72,28 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
 		up[2] = ent->matrix.m[0][2] * r_viewforward[2] + ent->matrix.m[1][2] * r_viewleft[2] + ent->matrix.m[2][2] * r_viewup[2];
 		break;
 	}
-	return false;
-}
-
-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)
-{
-	// 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;
-	vec3_t left, up, org, color, diffusecolor, diffusenormal;
-	mspriteframe_t *frame;
-	vec3_t diff;
-	float fog, ifog;
-
-	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))
+	if (!(ent->flags & RENDER_LIGHT))
 		color[0] = color[1] = color[2] = 1;
 	else
 	{
-		R_CompleteLightPoint(color, diffusecolor, diffusenormal, ent->origin, true, NULL);
+		R_CompleteLightPoint(color, diffusecolor, diffusenormal, ent->origin, true);
 		VectorMA(color, 0.5f, diffusecolor, color);
 	}
+	color[0] *= ent->colormod[0];
+	color[1] *= ent->colormod[1];
+	color[2] *= ent->colormod[2];
 
-	if (fogenabled)
-	{
-		VectorSubtract(ent->origin, r_vieworigin, diff);
-		fog = exp(fogdensity/DotProduct(diff,diff));
-		if (fog > 1)
-			fog = 1;
-	}
-	else
-		fog = 0;
-	ifog = 1 - fog;
-
-	if (r_lerpsprites.integer)
+	// LordHavoc: interpolated sprite rendering
+	for (i = 0;i < 4;i++)
 	{
-		// LordHavoc: interpolated sprite rendering
-		for (i = 0;i < 4;i++)
+		if (ent->frameblend[i].lerp >= 0.01f)
 		{
-			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->sprite.sprdata_frames + ent->frameblend[i].frame;
-
-		if (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);
+			// FIXME: negate left and right in loader
+			R_DrawSprite(GL_SRC_ALPHA, (ent->effects & EF_ADDITIVE) ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, frame->skin.base, frame->skin.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);
 		}
 	}
 }
@@ -145,8 +103,6 @@ void R_Model_Sprite_Draw(entity_render_t *ent)
 	if (ent->frameblend[0].frame < 0)
 		return;
 
-	c_sprites++;
-
-	R_MeshQueue_AddTransparent(ent->origin, R_DrawSpriteModelCallback, ent, 0);
+	R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : ent->origin, R_Model_Sprite_Draw_TransparentCallback, ent, 0, r_shadow_rtlight);
 }