changed brush model API - now uses function pointers for some of the brush model...

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 7af45a9a521724345b33758ed1143dbadc5b81ea..7fa46ea2dd51f73898222d18369e5dca146a1f49 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // on the same machine.
 
 #include "quakedef.h"
+#include "image.h"
 
 cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
 
@@ -36,7 +37,7 @@ void Mod_SpriteInit (void)
        Cvar_RegisterVariable(&r_mipsprites);
 }
 
-void Mod_Sprite_StripExtension(char *in, char *out)
+static void Mod_Sprite_StripExtension(char *in, char *out)
 {
        char *end;
        end = in + strlen(in);
@@ -51,7 +52,7 @@ void Mod_Sprite_StripExtension(char *in, char *out)
        *out++ = 0;
 }
 
-void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
+static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 {
        int                                     i, j, k, groupframes, realframes, x, y, origin[2], width, height;
        dspriteframetype_t      *pinframetype;
@@ -181,7 +182,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
                                        sprintf (name, "%s_%i_%i", tempname, i, j);
                                else
                                        sprintf (name, "%s_%i", tempname, i);
-                               loadmodel->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, r_mipsprites.integer, true);
+                               loadmodel->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE);
                                loadmodel->sprdata_frames[realframes].fogtexture = image_masktex;
 
                                if (!loadmodel->sprdata_frames[realframes].texture)
@@ -192,7 +193,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
                                        else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
                                                Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette);
 
-                                       loadmodel->sprdata_frames[realframes].texture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+                                       loadmodel->sprdata_frames[realframes].texture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE, NULL);
 
                                        // make fog version (just alpha)
                                        for (k = 0;k < width*height;k++)
@@ -205,7 +206,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
                                                sprintf (name, "%s_%i_%ifog", tempname, i, j);
                                        else
                                                sprintf (name, "%s_%ifog", tempname, i);
-                                       loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+                                       loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE, NULL);
 
                                        Mem_Free(pixbuf);
                                }
@@ -225,20 +226,12 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
                loadmodel->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius;
                loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius;
        }
+       loadmodel->radius = modelradius;
+       loadmodel->radius2 = modelradius * modelradius;
 }
 
-void Mod_Sprite_SERAddEntity(void)
-{
-       R_ClipSprite();
-}
-
-
-/*
-=================
-Mod_LoadSpriteModel
-=================
-*/
-void Mod_LoadSpriteModel (model_t *mod, void *buffer)
+extern void R_Model_Sprite_Draw(entity_render_t *ent);
+void Mod_IDSP_Load(model_t *mod, void *buffer)
 {
        int version, i, rendermode;
        qbyte palette[256][4], *in;
@@ -248,10 +241,11 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 
        datapointer = buffer;
 
-       loadmodel->SERAddEntity = Mod_Sprite_SERAddEntity;
-       loadmodel->Draw = R_DrawSpriteModel;
        loadmodel->DrawSky = NULL;
-       loadmodel->DrawShadow = NULL;
+       loadmodel->Draw = R_Model_Sprite_Draw;
+       loadmodel->DrawFakeShadow = NULL;
+       loadmodel->DrawShadowVolume = NULL;
+       loadmodel->DrawLight = NULL;
 
        version = LittleLong(((dsprite_t *)buffer)->version);
        if (version == SPRITE_VERSION || SPRITE32_VERSION)
@@ -263,7 +257,7 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
                loadmodel->sprnum_type = LittleLong (pinqsprite->type);
                loadmodel->synctype = LittleLong (pinqsprite->synctype);
 
-               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), d_8to24table);
+               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete);
        }
        else if (version == SPRITEHL_VERSION)
        {
@@ -279,7 +273,7 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
                datapointer += 2;
                i = in[0] + in[1] * 256;
                if (i != 256)
-                       Host_Error ("Mod_LoadHLSprite: unexpected number of palette colors %i (should be 256)", i);
+                       Host_Error ("Mod_IDSP_Load: unexpected number of palette colors %i (should be 256)", i);
                in = datapointer;
                datapointer += 768;
                switch(rendermode)
@@ -325,13 +319,13 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
                        palette[0][0] = palette[0][1] = palette[0][2] = palette[0][3] = 0;
                        break;
                default:
-                       Host_Error("Mod_LoadHLSprite: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i);
+                       Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i);
                        return;
                }
 
                Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0]));
        }
        else
-               Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
+               Host_Error("Mod_IDSP_Load: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
 }