X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=df61d746e9e657918f46b5530e4fc5aecd051e1a;hb=e7e25bfbf3783834a75fabf6cb5a1c36a19c95ba;hp=87c06b74ebce192b1bb36f8f9896db629d372920;hpb=2fe9d8457697fb9d9846e1464829bd976da30cfc;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 87c06b74..df61d746 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -6,8 +6,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 {
 	int i;
 	model_t *model = ent->model;
-	vec3_t left, up, org, color, diffusecolor, diffusenormal, mforward, mleft, mup;
-	mspriteframe_t *frame;
+	vec3_t left, up, org, mforward, mleft, mup;
 	float scale;
 
 	// nudge it toward the view to make sure it isn't in a wall
@@ -67,34 +66,27 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 
 	R_Mesh_Matrix(&identitymatrix);
 
-	if (!(ent->flags & RENDER_LIGHT))
-		color[0] = color[1] = color[2] = 1;
-	else
-	{
-		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];
-
 	// LordHavoc: interpolated sprite rendering
 	for (i = 0;i < 4;i++)
 	{
 		if (ent->frameblend[i].lerp >= 0.01f)
 		{
-			frame = model->sprite.sprdata_frames + ent->frameblend[i].frame;
+			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(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);
+			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, texture->currentlayers[0].color[0], texture->currentlayers[0].color[1], texture->currentlayers[0].color[2], ent->alpha * ent->frameblend[i].lerp);
 		}
 	}
 }
 
 void R_Model_Sprite_Draw(entity_render_t *ent)
 {
+	vec3_t org;
 	if (ent->frameblend[0].frame < 0)
 		return;
 
-	R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_view.origin : ent->origin, R_Model_Sprite_Draw_TransparentCallback, ent, 0, r_shadow_rtlight);
+	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);
 }