X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=d72bee10f904fa42cf8179fd55e61fa491f6cb46;hb=fa52203a89fe2b289fa7e1196dedf05329ff0728;hp=486b119f5271367b04278049bbbf47b97442cfb0;hpb=174b8bcffc1b69f555e9a978046240a4b072b1ab;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 486b119f..d72bee10 100644
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -35,7 +35,7 @@ extern cvar_t r_overheadsprites_scaley;
 #define SIDE_BOTTOM 3
 #define SIDE_RIGHT 4
 
-void R_TrackSprite(const entity_render_t *ent, vec3_t origin, vec3_t left, vec3_t up, int *edge, float *dir_angle)
+static void R_TrackSprite(const entity_render_t *ent, vec3_t origin, vec3_t left, vec3_t up, int *edge, float *dir_angle)
 {
 	float distance;
 	vec3_t bCoord; // body coordinates of object
@@ -141,7 +141,7 @@ void R_TrackSprite(const entity_render_t *ent, vec3_t origin, vec3_t left, vec3_
 	}
 }
 
-void R_RotateSprite(const mspriteframe_t *frame, vec3_t origin, vec3_t left, vec3_t up, int edge, float dir_angle)
+static void R_RotateSprite(const mspriteframe_t *frame, vec3_t origin, vec3_t left, vec3_t up, int edge, float dir_angle)
 {
 	if(!(r_track_sprites_flags.integer & TSF_ROTATE))
 	{
@@ -205,7 +205,7 @@ void R_RotateSprite(const mspriteframe_t *frame, vec3_t origin, vec3_t left, vec
 
 static float spritetexcoord2f[4*2] = {0, 1, 0, 0, 1, 0, 1, 1};
 
-void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
+static void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
 	int i;
 	dp_model_t *model = ent->model;
@@ -258,7 +258,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 		// honors scale
 		// honors a global label scaling cvar
 	
-		if(r_waterstate.renderingscene) // labels are considered HUD items, and don't appear in reflections
+		if(r_fb.water.renderingscene) // labels are considered HUD items, and don't appear in reflections
 			return;
 
 		// See the R_TrackSprite definition for a reason for this copying
@@ -281,7 +281,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 		// honors a global label scaling cvar before the rounding
 		// FIXME assumes that 1qu is 1 pixel in the sprite like in SPR32 format. Should not do that, but instead query the source image! This bug only applies to the roundtopixels case, though.
 
-		if(r_waterstate.renderingscene) // labels are considered HUD items, and don't appear in reflections
+		if(r_fb.water.renderingscene) // labels are considered HUD items, and don't appear in reflections
 			return;
 
 		// See the R_TrackSprite definition for a reason for this copying
@@ -392,9 +392,15 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 			frame = model->sprite.sprdata_frames + ent->frameblend[i].subframe;
 			texture = R_GetCurrentTexture(model->data_textures + ent->frameblend[i].subframe);
 		
-			// lit sprite by lightgrid if it is not fullbright, lit only ambient
+			// sprites are fullbright by default, but if this one is not fullbright we
+			// need to combine the lighting into ambient as sprite lighting is not
+			// directional
 			if (!(texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT))
-				VectorAdd(ent->modellight_ambient, ent->modellight_diffuse, rsurface.modellight_ambient); // sprites dont use lightdirection
+			{
+				VectorMAM(1.0f, texture->render_modellight_ambient, 0.25f, texture->render_modellight_diffuse, texture->render_modellight_ambient);
+				VectorClear(texture->render_modellight_diffuse);
+				VectorClear(texture->render_modellight_specular);
+			}
 
 			// SPR_LABEL should not use depth test AT ALL
 			if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
@@ -424,6 +430,6 @@ void R_Model_Sprite_Draw(entity_render_t *ent)
 		return;
 
 	Matrix4x4_OriginFromMatrix(&ent->matrix, org);
-	R_MeshQueue_AddTransparent(ent->flags & RENDER_NODEPTHTEST ? r_refdef.view.origin : org, R_Model_Sprite_Draw_TransparentCallback, ent, 0, rsurface.rtlight);
+	R_MeshQueue_AddTransparent((ent->flags & RENDER_WORLDOBJECT) ? TRANSPARENTSORT_SKY : (ent->flags & RENDER_NODEPTHTEST) ? TRANSPARENTSORT_HUD : TRANSPARENTSORT_DISTANCE, org, R_Model_Sprite_Draw_TransparentCallback, ent, 0, rsurface.rtlight);
 }