Fix sprites whose name begins from ! (assumed lit sprites) to be actually lit with...

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index 75535e303ad2097932c46ab682fab5860cb34417..fbcd8b36d4b4b504ea6422090c49c1973b2444b6 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -8,6 +8,8 @@ extern cvar_t r_track_sprites;
 extern cvar_t r_track_sprites_flags;
 extern cvar_t r_track_sprites_scalew;
 extern cvar_t r_track_sprites_scaleh;
+extern cvar_t r_overheadsprites_perspective;
+extern cvar_t r_overheadsprites_pushback;
 
 #define TSF_ROTATE 1
 #define TSF_ROTATE_CONTINOUSLY 2
@@ -353,6 +355,22 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                up[1] = mup[0] * r_refdef.view.forward[1] + mup[1] * r_refdef.view.left[1] + mup[2] * r_refdef.view.up[1];
                up[2] = mup[0] * r_refdef.view.forward[2] + mup[1] * r_refdef.view.left[2] + mup[2] * r_refdef.view.up[2];
                break;
+       case SPR_OVERHEAD:
+               VectorScale(r_refdef.view.left, ent->scale, left);
+               VectorScale(r_refdef.view.up, ent->scale, up);
+               // offset
+               VectorCopy(r_refdef.view.up, up);
+               up[2] = up[2] + r_overheadsprites_perspective.value; VectorNormalize(up); // some rotation
+               VectorScale(up, ent->scale, up);
+               // offset (move nearer to player, yz is camera plane)
+               VectorSubtract(r_refdef.view.origin, org, middle);
+               VectorNormalize(middle);
+               org[0] = org[0] + middle[0]*r_overheadsprites_pushback.value;
+               org[1] = org[1] + middle[1]*r_overheadsprites_pushback.value;
+               org[2] = org[2] + middle[2]*r_overheadsprites_pushback.value;
+                // simlulate a bit of perspective effect
+               up[2] = up[2] + r_overheadsprites_perspective.value;
+               break;
        }
 
        // LordHavoc: interpolated sprite rendering
@@ -366,6 +384,10 @@ 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
+                       if (!(texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT))
+                               VectorAdd(ent->modellight_ambient, ent->modellight_diffuse, rsurface.modellight_ambient);
+
                        // SPR_LABEL should not use depth test AT ALL
                        if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
                                if(texture->currentmaterialflags & MATERIALFLAG_SHORTDEPTHRANGE)
@@ -380,7 +402,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
 
                        R_CalcSprite_Vertex3f(vertex3f, org, left, up, frame->left, frame->right, frame->down, frame->up);
 
-                       R_DrawCustomSurface(texture->currentskinframe, &identitymatrix, texture->currentmaterialflags, 0, 4, 0, 2, false, false);
+                       R_DrawCustomSurface_Texture(texture, &identitymatrix, texture->currentmaterialflags, 0, 4, 0, 2, false, false);
                }
        }