now reports resamplesfx calls that don't involve resampling (of course only if develo...

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index d839057b0681b9fb55ef111004937a5897b29db7..7b5b8e55a604237aebe7ba5bc8700afd2578e30e 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -1,8 +1,6 @@
 
 #include "quakedef.h"
 
-#define LERPSPRITES
-
 static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], float left[3], float up[3])
 {
        float matrix1[3][3], matrix2[3][3], matrix3[3][3];
@@ -78,20 +76,10 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
        return false;
 }
 
-static void R_DrawSpriteImage (int additive, mspriteframe_t *frame, int texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
+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)
 {
-       rmeshstate_t m;
-       memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       if (additive)
-               m.blendfunc2 = GL_ONE;
-       m.tex[0] = texture;
-       R_Mesh_State(&m);
-
-       GL_Color(red * r_colorscale, green * r_colorscale, blue * r_colorscale, alpha);
        // FIXME: negate left and right in loader
-       R_DrawSpriteMesh(origin, left, up, frame->left, frame->right, frame->down, frame->up);
+       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)
@@ -124,28 +112,31 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
                fog = 0;
        ifog = 1 - fog;
 
-#ifdef LERPSPRITES
-       // LordHavoc: interpolated sprite rendering
-       for (i = 0;i < 4;i++)
+       if (r_lerpsprites.integer)
        {
-               if (ent->frameblend[i].lerp >= 0.01f)
+               // LordHavoc: interpolated sprite rendering
+               for (i = 0;i < 4;i++)
                {
-                       frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
-                       R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, R_GetTexture(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, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
+                       if (ent->frameblend[i].lerp >= 0.01f)
+                       {
+                               frame = ent->model->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->sprdata_frames + ent->frameblend[i].frame;
-
-       R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, R_GetTexture(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, R_GetTexture(frame->fogtexture), org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
-#endif
+       else
+       {
+               // LordHavoc: no interpolation
+               frame = NULL;
+               for (i = 0;i < 4 && ent->frameblend[i].lerp;i++)
+                       frame = ent->model->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);
+               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);
+       }
 }
 
 void R_Model_Sprite_Draw(entity_render_t *ent)