int edge = 0;
float dir_angle = 0.0f;
+ // R_GetCurrentTexture needs this
+ rsurface.entity = (entity_render_t *)ent;
+
// 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_refdef.view.forward, org);
// fixed HUD pixel size specified in sprite
// honors scale
// honors a global label scaling cvar
+
+ if(r_waterstate.renderingscene) // labels are considered HUD items, and don't appear in reflections
+ return;
// See the R_TrackSprite definition for a reason for this copying
VectorCopy(r_refdef.view.left, left);
// 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
+ return;
+
// See the R_TrackSprite definition for a reason for this copying
VectorCopy(r_refdef.view.left, left);
VectorCopy(r_refdef.view.up, up);
R_Mesh_Matrix(&identitymatrix);
// LordHavoc: interpolated sprite rendering
- for (i = 0;i < 4;i++)
+ for (i = 0;i < MAX_FRAMEBLENDS;i++)
{
if (ent->frameblend[i].lerp >= 0.01f)
{
- mspriteframe_t *frame = model->sprite.sprdata_frames + ent->frameblend[i].frame;
- texture_t *texture = model->data_textures + ent->frameblend[i].frame;
+ mspriteframe_t *frame = model->sprite.sprdata_frames + ent->frameblend[i].subframe;
+ texture_t *texture = R_GetCurrentTexture(model->data_textures + ent->frameblend[i].subframe);
#if 0
vec3_t o, l, u;
#endif
- R_UpdateTextureInfo(ent, texture);
// SPR_LABEL should not use depth test AT ALL
if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
}
}
}
+
+ rsurface.entity = NULL;
}
void R_Model_Sprite_Draw(entity_render_t *ent)
{
vec3_t org;
- if (ent->frameblend[0].frame < 0)
+ if (ent->frameblend[0].subframe < 0)
return;
Matrix4x4_OriginFromMatrix(&ent->matrix, org);