]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_sprite.c
Made RENDERPATH_GL20 require fbo support and always use it.
[xonotic/darkplaces.git] / model_sprite.c
index d2509037263453cea54c4f494f39a154c1e60554..12819e40e5a5fa72fb9ee69ccb89c62d949f33c5 100644 (file)
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -23,8 +23,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // on the same machine.
 
 #include "quakedef.h"
-
-cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
+#include "image.h"
+
+cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps sprites so they render faster in the distance and do not display noise artifacts"};
+cvar_t r_labelsprites_scale = {CVAR_SAVE, "r_labelsprites_scale", "1", "global scale to apply to label sprites before conversion to HUD coordinates"};
+cvar_t r_labelsprites_roundtopixels = {CVAR_SAVE, "r_labelsprites_roundtopixels", "1", "try to make label sprites sharper by rounding their size to 0.5x or 1x and by rounding their position to whole pixels if possible"};
+cvar_t r_overheadsprites_perspective = {CVAR_SAVE, "r_overheadsprites_perspective", "5", "fake perspective effect for SPR_OVERHEAD sprites"};
+cvar_t r_overheadsprites_pushback = {CVAR_SAVE, "r_overheadsprites_pushback", "15", "how far to pull the SPR_OVERHEAD sprites toward the eye (used to avoid intersections with 3D models)"};
+cvar_t r_overheadsprites_scalex = {CVAR_SAVE, "r_overheadsprites_scalex", "1", "additional scale for overhead sprites for x axis"};
+cvar_t r_overheadsprites_scaley = {CVAR_SAVE, "r_overheadsprites_scaley", "1", "additional scale for overhead sprites for y axis"};
+cvar_t r_track_sprites = {CVAR_SAVE, "r_track_sprites", "1", "track SPR_LABEL* sprites by putting them as indicator at the screen border to rotate to"};
+cvar_t r_track_sprites_flags = {CVAR_SAVE, "r_track_sprites_flags", "1", "1: Rotate sprites accordingly, 2: Make it a continuous rotation"};
+cvar_t r_track_sprites_scalew = {CVAR_SAVE, "r_track_sprites_scalew", "1", "width scaling of tracked sprites"};
+cvar_t r_track_sprites_scaleh = {CVAR_SAVE, "r_track_sprites_scaleh", "1", "height scaling of tracked sprites"};
 
 /*
 ===============
@@ -34,450 +45,445 @@ Mod_SpriteInit
 void Mod_SpriteInit (void)
 {
        Cvar_RegisterVariable(&r_mipsprites);
+       Cvar_RegisterVariable(&r_labelsprites_scale);
+       Cvar_RegisterVariable(&r_labelsprites_roundtopixels);
+       Cvar_RegisterVariable(&r_overheadsprites_perspective);
+       Cvar_RegisterVariable(&r_overheadsprites_pushback);
+       Cvar_RegisterVariable(&r_overheadsprites_scalex);
+       Cvar_RegisterVariable(&r_overheadsprites_scaley);
+       Cvar_RegisterVariable(&r_track_sprites);
+       Cvar_RegisterVariable(&r_track_sprites_flags);
+       Cvar_RegisterVariable(&r_track_sprites_scalew);
+       Cvar_RegisterVariable(&r_track_sprites_scaleh);
 }
 
-void Mod_Sprite_StripExtension(char *in, char *out)
+static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive)
 {
-       char *end;
-       end = in + strlen(in);
-       if ((end - in) >= 6)
-               if (strcmp(end - 6, ".spr32") == 0)
-                       end -= 6;
-       if ((end - in) >= 4)
-               if (strcmp(end - 4, ".spr") == 0)
-                       end -= 4;
-       while (in < end)
-               *out++ = *in++;
-       *out++ = 0;
+       if (!skinframe)
+               skinframe = R_SkinFrame_LoadMissing();
+       texture->offsetmapping = OFFSETMAPPING_OFF;
+       texture->offsetscale = 1;
+       texture->offsetbias = 0;
+       texture->specularscalemod = 1;
+       texture->specularpowermod = 1;
+       texture->basematerialflags = MATERIALFLAG_WALL;
+       texture->basealpha = 1.0f;
+       if (fullbright)
+               texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
+       if (additive)
+               texture->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+       else if (skinframe->hasalpha)
+               texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+       texture->currentmaterialflags = texture->basematerialflags;
+       texture->materialshaderpass = texture->shaderpasses[0] = Mod_CreateShaderPass(loadmodel->mempool, skinframe);
+       texture->currentskinframe = skinframe;
+       texture->surfaceflags = 0;
+       texture->supercontents = SUPERCONTENTS_SOLID;
+       if (!(texture->basematerialflags & MATERIALFLAG_BLENDED))
+               texture->supercontents |= SUPERCONTENTS_OPAQUE;
+       texture->transparentsort = TRANSPARENTSORT_DISTANCE;
+       // WHEN ADDING DEFAULTS HERE, REMEMBER TO PUT DEFAULTS IN ALL LOADERS
+       // JUST GREP FOR "specularscalemod = 1".
 }
 
-/*
-=================
-Mod_LoadSpriteFrame
-=================
-*/
-void * Mod_LoadSpriteFrame (void * pin, mspriteframe_t *frame, int framenum, int bytesperpixel, byte *palette)
+extern cvar_t gl_texturecompression_sprites;
+
+static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, qboolean additive)
 {
+       int                                     i, j, groupframes, realframes, x, y, origin[2], width, height;
+       qboolean                        fullbright;
+       dspriteframetype_t      *pinframetype;
        dspriteframe_t          *pinframe;
-       mspriteframe_t          *pspriteframe;
-       int                                     i, width, height, size, origin[2];
-       char                            name[256], tempname[256];
-       byte                            *pixbuf, *pixel, *inpixel;
-
-       pinframe = (dspriteframe_t *)pin;
+       dspritegroup_t          *pingroup;
+       dspriteinterval_t       *pinintervals;
+       skinframe_t                     *skinframe;
+       float                           modelradius, interval;
+       char                            name[MAX_QPATH], fogname[MAX_QPATH];
+       const void                      *startframes;
+       int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | ((gl_texturecompression.integer && gl_texturecompression_sprites.integer) ? TEXF_COMPRESS : 0) | TEXF_ISSPRITE | TEXF_PICMIP | TEXF_ALPHA | TEXF_CLAMP;
+       modelradius = 0;
+
+       if (loadmodel->numframes < 1)
+               Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d", loadmodel->numframes);
 
-       width = LittleLong (pinframe->width);
-       height = LittleLong (pinframe->height);
-       size = width * height * bytesperpixel;
-
-       pspriteframe = frame;
-
-       memset (pspriteframe, 0, sizeof (mspriteframe_t));
-
-//     pspriteframe->width = width;
-//     pspriteframe->height = height;
-       origin[0] = LittleLong (pinframe->origin[0]);
-       origin[1] = LittleLong (pinframe->origin[1]);
+       // LordHavoc: hack to allow sprites to be non-fullbright
+       fullbright = true;
+       for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++)
+               if (loadmodel->name[i] == '!')
+                       fullbright = false;
 
-       pspriteframe->up = origin[1];
-       pspriteframe->down = origin[1] - height;
-       pspriteframe->left = origin[0];
-       pspriteframe->right = width + origin[0];
+//
+// load the frames
+//
+       startframes = datapointer;
+       realframes = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
+       {
+               pinframetype = (dspriteframetype_t *)datapointer;
+               datapointer += sizeof(dspriteframetype_t);
 
-       Mod_Sprite_StripExtension(loadmodel->name, tempname);
-       sprintf (name, "%s_%i", tempname, framenum);
-       pspriteframe->texture = loadtextureimagewithmask(name, 0, 0, false, r_mipsprites.value, true);
-       pspriteframe->fogtexture = image_masktex;
+               if (LittleLong (pinframetype->type) == SPR_SINGLE)
+                       groupframes = 1;
+               else
+               {
+                       pingroup = (dspritegroup_t *)datapointer;
+                       datapointer += sizeof(dspritegroup_t);
 
-       pixbuf = qmalloc(width*height*4);
+                       groupframes = LittleLong(pingroup->numframes);
 
-       inpixel = (byte *)(pinframe + 1);
-       pixel = pixbuf;
-       if (bytesperpixel == 1)
-       {
-               for (i = 0;i < width * height;i++)
-               {
-                       *pixel++ = palette[inpixel[i]*4+0];
-                       *pixel++ = palette[inpixel[i]*4+1];
-                       *pixel++ = palette[inpixel[i]*4+2];
-                       *pixel++ = palette[inpixel[i]*4+3];
+                       datapointer += sizeof(dspriteinterval_t) * groupframes;
                }
-       }
-       else
-               memcpy(pixel, inpixel, width*height*4);
 
-       if (!pspriteframe->texture)
-       {
-               pspriteframe->texture = R_LoadTexture (name, width, height, pixbuf, TEXF_ALPHA | TEXF_RGBA | (r_mipsprites.value ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
-               // make fog version (just alpha)
-               pixel = pixbuf;
-               for (i = 0;i < width*height;i++)
+               for (j = 0;j < groupframes;j++)
                {
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       *pixel++ = 255;
-                       pixel++;
+                       pinframe = (dspriteframe_t *)datapointer;
+                       if (version == SPRITE32_VERSION)
+                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height) * 4;
+                       else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height);
                }
-               sprintf (name, "%s_%ifog", loadmodel->name, framenum);
-               pspriteframe->fogtexture = R_LoadTexture (name, width, height, pixbuf, TEXF_ALPHA | TEXF_RGBA | (r_mipsprites.value ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+               realframes += groupframes;
        }
 
-       qfree(pixbuf);
+       loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+       loadmodel->sprite.sprdata_frames = (mspriteframe_t *)Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
+       loadmodel->num_textures = realframes;
+       loadmodel->num_texturesperskin = 1;
+       loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, sizeof(texture_t) * loadmodel->num_textures);
 
-       return (void *)((byte *)pinframe + sizeof (dspriteframe_t) + size);
-}
-
-
-/*
-=================
-Mod_LoadSpriteGroup
-=================
-*/
-/*
-void *Mod_LoadSpriteGroup (void * pin, mspriteframe_t *frame, int numframes, int framenum, int bytesperpixel)
-{
-       int i;
-       void *ptemp;
+       datapointer = (unsigned char *)startframes;
+       realframes = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
+       {
+               pinframetype = (dspriteframetype_t *)datapointer;
+               datapointer += sizeof(dspriteframetype_t);
 
-       ptemp = (void *)(sizeof(dspriteinterval_t) * numframes + sizeof(dspritegroup_t) + (int) pin);
+               if (LittleLong (pinframetype->type) == SPR_SINGLE)
+               {
+                       groupframes = 1;
+                       interval = 0.1f;
+               }
+               else
+               {
+                       pingroup = (dspritegroup_t *)datapointer;
+                       datapointer += sizeof(dspritegroup_t);
 
-       for (i = 0;i < numframes;i++)
-               ptemp = Mod_LoadSpriteFrame (ptemp, frame++, framenum * 100 + i, bytesperpixel);
+                       groupframes = LittleLong(pingroup->numframes);
 
-       return ptemp;
-}
-*/
+                       pinintervals = (dspriteinterval_t *)datapointer;
+                       datapointer += sizeof(dspriteinterval_t) * groupframes;
 
-// this actually handles both quake sprite and darkplaces sprite32
-void Mod_LoadQuakeSprite (model_t *mod, void *buffer)
-{
-       int                                     i, j, version, numframes, realframes, size, bytesperpixel, start, end, total, maxwidth, maxheight;
-       dsprite_t                       *pin;
-       msprite_t                       *psprite;
-       dspriteframetype_t      *pframetype;
-       dspriteframe_t          *pframe;
-       animscene_t                     *animscenes;
-       mspriteframe_t          *frames;
-       dspriteframe_t          **framedata;
-
-       start = Hunk_LowMark ();
-
-       mod->flags = EF_FULLBRIGHT;
-       // LordHavoc: hack to allow sprites to be non-fullbright
-       for (i = 0;i < MAX_QPATH && mod->name[i];i++)
-       {
-               if (mod->name[i] == '!')
-               {
-                       mod->flags &= ~EF_FULLBRIGHT;
-                       break;
+                       interval = LittleFloat(pinintervals[0].interval);
+                       if (interval < 0.01f)
+                               Host_Error("Mod_Sprite_SharedSetup: invalid interval");
                }
-       }
 
-       // build a list of frames while parsing
-       framedata = qmalloc(65536*sizeof(dspriteframe_t));
+               dpsnprintf(loadmodel->animscenes[i].name, sizeof(loadmodel->animscenes[i].name), "frame %i", i);
+               loadmodel->animscenes[i].firstframe = realframes;
+               loadmodel->animscenes[i].framecount = groupframes;
+               loadmodel->animscenes[i].framerate = 1.0f / interval;
+               loadmodel->animscenes[i].loop = true;
 
-       pin = (dsprite_t *)buffer;
+               for (j = 0;j < groupframes;j++)
+               {
+                       pinframe = (dspriteframe_t *)datapointer;
+                       datapointer += sizeof(dspriteframe_t);
 
-       version = LittleLong (pin->version);
-       // LordHavoc: 32bit textures
-       bytesperpixel = 1;
-       if (version == SPRITE32_VERSION)
-               bytesperpixel = 4;
+                       origin[0] = LittleLong (pinframe->origin[0]);
+                       origin[1] = LittleLong (pinframe->origin[1]);
+                       width = LittleLong (pinframe->width);
+                       height = LittleLong (pinframe->height);
 
-       numframes = LittleLong (pin->numframes);
+                       loadmodel->sprite.sprdata_frames[realframes].left = origin[0];
+                       loadmodel->sprite.sprdata_frames[realframes].right = origin[0] + width;
+                       loadmodel->sprite.sprdata_frames[realframes].up = origin[1];
+                       loadmodel->sprite.sprdata_frames[realframes].down = origin[1] - height;
 
-       psprite = Hunk_AllocName (sizeof(msprite_t), va("%s info", loadname));
+                       x = (int)max(loadmodel->sprite.sprdata_frames[realframes].left * loadmodel->sprite.sprdata_frames[realframes].left, loadmodel->sprite.sprdata_frames[realframes].right * loadmodel->sprite.sprdata_frames[realframes].right);
+                       y = (int)max(loadmodel->sprite.sprdata_frames[realframes].up * loadmodel->sprite.sprdata_frames[realframes].up, loadmodel->sprite.sprdata_frames[realframes].down * loadmodel->sprite.sprdata_frames[realframes].down);
+                       if (modelradius < x + y)
+                               modelradius = x + y;
 
-//     mod->cache.data = psprite;
+                       if (cls.state != ca_dedicated)
+                       {
+                               skinframe = NULL;
+                               // note: Nehahra's null.spr has width == 0 and height == 0
+                               if (width > 0 && height > 0)
+                               {
+                                       if (groupframes > 1)
+                                       {
+                                               dpsnprintf (name, sizeof(name), "%s_%i_%i", loadmodel->name, i, j);
+                                               dpsnprintf (fogname, sizeof(fogname), "%s_%i_%ifog", loadmodel->name, i, j);
+                                       }
+                                       else
+                                       {
+                                               dpsnprintf (name, sizeof(name), "%s_%i", loadmodel->name, i);
+                                               dpsnprintf (fogname, sizeof(fogname), "%s_%ifog", loadmodel->name, i);
+                                       }
+                                       if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false, false)))
+                                       {
+                                               unsigned char *pixels = (unsigned char *) Mem_Alloc(loadmodel->mempool, width*height*4);
+                                               if (version == SPRITE32_VERSION)
+                                               {
+                                                       for (x = 0;x < width*height;x++)
+                                                       {
+                                                               pixels[x*4+2] = datapointer[x*4+0];
+                                                               pixels[x*4+1] = datapointer[x*4+1];
+                                                               pixels[x*4+0] = datapointer[x*4+2];
+                                                               pixels[x*4+3] = datapointer[x*4+3];
+                                                       }
+                                               }
+                                               else //if (version == SPRITEHL_VERSION || version == SPRITE_VERSION)
+                                                       Image_Copy8bitBGRA(datapointer, pixels, width*height, palette ? palette : palette_bgra_transparent);
+                                               skinframe = R_SkinFrame_LoadInternalBGRA(name, texflags, pixels, width, height, false);
+                                               // texflags |= TEXF_COMPRESS;
+                                               Mem_Free(pixels);
+                                       }
+                               }
+                               if (skinframe == NULL)
+                                       skinframe = R_SkinFrame_LoadMissing();
+                               Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
+                       }
 
-       psprite->type = LittleLong (pin->type);
-       maxwidth = LittleLong (pin->width);
-       maxheight = LittleLong (pin->height);
-//     psprite->beamlength = LittleFloat (pin->beamlength);
-       mod->synctype = LittleLong (pin->synctype);
-//     psprite->numframes = numframes;
+                       if (version == SPRITE32_VERSION)
+                               datapointer += width * height * 4;
+                       else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+                               datapointer += width * height;
+                       realframes++;
+               }
+       }
 
-       mod->mins[0] = mod->mins[1] = -maxwidth/2;
-       mod->maxs[0] = mod->maxs[1] = maxwidth/2;
-       mod->mins[2] = -maxheight/2;
-       mod->maxs[2] = maxheight/2;
+       modelradius = sqrt(modelradius);
+       for (i = 0;i < 3;i++)
+       {
+               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;
+}
 
-//
-// load the frames
-//
-       if (numframes < 1)
-               Host_Error ("Mod_LoadQuakeSprite: Invalid # of frames: %d\n", numframes);
+void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int version;
+       const unsigned char *datapointer;
 
-       mod->numframes = numframes;
+       datapointer = (unsigned char *)buffer;
 
-       pframetype = (dspriteframetype_t *)(pin + 1);
+       loadmodel->modeldatatypestring = "SPR1";
 
-       animscenes = Hunk_AllocName(sizeof(animscene_t) * mod->numframes, va("%s sceneinfo", loadname));
+       loadmodel->type = mod_sprite;
 
-       realframes = 0;
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Sprite_Draw;
+       loadmodel->DrawDepth = NULL;
+       loadmodel->CompileShadowVolume = NULL;
+       loadmodel->DrawShadowVolume = NULL;
+       loadmodel->DrawLight = NULL;
+       loadmodel->DrawAddWaterPlanes = NULL;
 
-       for (i = 0;i < numframes;i++)
+       version = LittleLong(((dsprite_t *)buffer)->version);
+       if (version == SPRITE_VERSION || version == SPRITE32_VERSION)
        {
-               spriteframetype_t       frametype;
+               dsprite_t *pinqsprite;
 
-               frametype = LittleLong (pframetype->type);
+               pinqsprite = (dsprite_t *)datapointer;
+               datapointer += sizeof(dsprite_t);
 
-               sprintf(animscenes[i].name, "frame%i", i);
-               animscenes[i].firstframe = realframes;
-               animscenes[i].loop = true;
-               if (frametype == SPR_SINGLE)
-               {
-                       animscenes[i].framecount = 1;
-                       animscenes[i].framerate = 10;
-                       pframe = (dspriteframe_t *) (pframetype + 1);
-                       framedata[realframes] = pframe;
-                       size = LittleLong(pframe->width) * LittleLong(pframe->height) * bytesperpixel;
-                       pframetype = (dspriteframetype_t *) (size + sizeof(dspriteframe_t) + (int) pframe);
-                       realframes++;
-               }
-               else
+               loadmodel->numframes = LittleLong (pinqsprite->numframes);
+               loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type);
+               loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype);
+
+               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, false);
+       }
+       else if (version == SPRITEHL_VERSION)
+       {
+               int i, rendermode;
+               unsigned char palette[256][4];
+               const unsigned char *in;
+               dspritehl_t *pinhlsprite;
+
+               pinhlsprite = (dspritehl_t *)datapointer;
+               datapointer += sizeof(dspritehl_t);
+
+               loadmodel->numframes = LittleLong (pinhlsprite->numframes);
+               loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type);
+               loadmodel->synctype = (synctype_t)LittleLong (pinhlsprite->synctype);
+               rendermode = pinhlsprite->rendermode;
+
+               in = datapointer;
+               datapointer += 2;
+               i = in[0] + in[1] * 256;
+               if (i != 256)
+                       Host_Error ("Mod_IDSP_Load: unexpected number of palette colors %i (should be 256)", i);
+               in = datapointer;
+               datapointer += 768;
+               switch(rendermode)
                {
-                       j = LittleLong(((dspritegroup_t *) (sizeof(dspriteframetype_t) + (int) pframetype))->numframes);
-                       animscenes[i].framecount = j;
-                       // FIXME: support variable framerate?
-                       animscenes[i].framerate = 1.0f / LittleFloat(((dspriteinterval_t *) (sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype))->interval);
-                       pframe = (dspriteframe_t *) (sizeof(dspriteinterval_t) * j + sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype);
-                       while (j--)
+               case SPRHL_OPAQUE:
+                       for (i = 0;i < 256;i++)
                        {
-                               framedata[realframes] = pframe;
-                               size = LittleLong(pframe->width) * LittleLong(pframe->height) * bytesperpixel;
-                               pframe = (dspriteframe_t *) (size + sizeof(dspriteframe_t) + (int) pframe);
-                               realframes++;
+                               palette[i][2] = in[i*3+0];
+                               palette[i][1] = in[i*3+1];
+                               palette[i][0] = in[i*3+2];
+                               palette[i][3] = 255;
                        }
-                       pframetype = (dspriteframetype_t *) pframe;
+                       break;
+               case SPRHL_ADDITIVE:
+                       for (i = 0;i < 256;i++)
+                       {
+                               palette[i][2] = in[i*3+0];
+                               palette[i][1] = in[i*3+1];
+                               palette[i][0] = in[i*3+2];
+                               palette[i][3] = 255;
+                       }
+                       // also passes additive == true to Mod_Sprite_SharedSetup
+                       break;
+               case SPRHL_INDEXALPHA:
+                       for (i = 0;i < 256;i++)
+                       {
+                               palette[i][2] = in[765];
+                               palette[i][1] = in[766];
+                               palette[i][0] = in[767];
+                               palette[i][3] = i;
+                               in += 3;
+                       }
+                       break;
+               case SPRHL_ALPHATEST:
+                       for (i = 0;i < 256;i++)
+                       {
+                               palette[i][2] = in[i*3+0];
+                               palette[i][1] = in[i*3+1];
+                               palette[i][0] = in[i*3+2];
+                               palette[i][3] = 255;
+                       }
+                       palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
+                       // should this use alpha test or alpha blend?  (currently blend)
+                       break;
+               default:
+                       Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)", i);
+                       return;
                }
-       }
-
-       mod->ofs_scenes = (int) animscenes - (int) psprite;
-
-       frames = Hunk_AllocName(sizeof(mspriteframe_t) * realframes, va("%s frames", loadname));
 
-       realframes = 0;
-       for (i = 0;i < numframes;i++)
-       {
-               for (j = 0;j < animscenes[i].framecount;j++)
-               {
-                       Mod_LoadSpriteFrame (framedata[realframes], frames + realframes, i, bytesperpixel, (byte *)&d_8to24table);
-                       realframes++;
-               }
+               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[0][0]), rendermode == SPRHL_ADDITIVE);
        }
+       else
+               Host_Error("Mod_IDSP_Load: %s has wrong version number (%i). Only %i (quake), %i (HalfLife), and %i (sprite32) supported",
+                                       loadmodel->name, version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION);
 
-       psprite->ofs_frames = (int) frames - (int) psprite;
-
-       qfree(framedata);
-
-       mod->type = mod_sprite;
-
-// move the complete, relocatable sprite model to the cache
-       end = Hunk_LowMark ();
-       mod->cachesize = total = end - start;
-
-       Cache_Alloc (&mod->cache, total, loadname);
-       if (!mod->cache.data)
-               return;
-       memcpy (mod->cache.data, psprite, total);
-
-       Hunk_FreeToLowMark (start);
+       // TODO: Note that isanimated only means whether vertices change due to
+       // the animation. This may happen due to sprframe parameters changing.
+       // Mere texture chanegs OTOH shouldn't require isanimated to be 1.
+       loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1);
 }
 
-void Mod_LoadHLSprite (model_t *mod, void *buffer)
-{
-       int                                     i, j, numframes, realframes, size, start, end, total, maxwidth, maxheight, rendermode;
-       byte                            palette[256][4], *in;
-       dspritehl_t                     *pin;
-       msprite_t                       *psprite;
-       dspriteframetype_t      *pframetype;
-       dspriteframe_t          *pframe;
-       animscene_t                     *animscenes;
-       mspriteframe_t          *frames;
-       dspriteframe_t          **framedata;
-
-       start = Hunk_LowMark ();
 
-       mod->flags = EF_FULLBRIGHT;
+void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int i, version;
+       qboolean fullbright;
+       const dsprite2_t *pinqsprite;
+       skinframe_t *skinframe;
+       float modelradius;
+       int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ISSPRITE | TEXF_PICMIP | TEXF_COMPRESS | TEXF_ALPHA | TEXF_CLAMP;
 
-       // build a list of frames while parsing
-       framedata = qmalloc(65536*sizeof(dspriteframe_t));
+       loadmodel->modeldatatypestring = "SPR2";
 
-       pin = (dspritehl_t *)buffer;
+       loadmodel->type = mod_sprite;
 
-       numframes = LittleLong (pin->numframes);
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Sprite_Draw;
+       loadmodel->DrawDepth = NULL;
+       loadmodel->CompileShadowVolume = NULL;
+       loadmodel->DrawShadowVolume = NULL;
+       loadmodel->DrawLight = NULL;
+       loadmodel->DrawAddWaterPlanes = NULL;
 
-       psprite = Hunk_AllocName (sizeof(msprite_t), va("%s info", loadname));
+       pinqsprite = (dsprite2_t *)buffer;
 
-       psprite->type = LittleLong (pin->type);
-       maxwidth = LittleLong (pin->width);
-       maxheight = LittleLong (pin->height);
-       mod->synctype = LittleLong (pin->synctype);
-       rendermode = pin->rendermode;
+       version = LittleLong(pinqsprite->version);
+       if (version != SPRITE2_VERSION)
+               Host_Error("Mod_IDS2_Load: %s has wrong version number (%i should be 2 (quake 2)", loadmodel->name, version);
 
-       mod->mins[0] = mod->mins[1] = -maxwidth/2;
-       mod->maxs[0] = mod->maxs[1] = maxwidth/2;
-       mod->mins[2] = -maxheight/2;
-       mod->maxs[2] = maxheight/2;
+       loadmodel->numframes = LittleLong (pinqsprite->numframes);
+       if (loadmodel->numframes < 1)
+               Host_Error ("Mod_IDS2_Load: Invalid # of frames: %d", loadmodel->numframes);
+       loadmodel->sprite.sprnum_type = SPR_VP_PARALLEL;
+       loadmodel->synctype = ST_SYNC;
 
-//
-// load the frames
-//
-       if (numframes < 1)
-               Host_Error ("Mod_LoadHLSprite: Invalid # of frames: %d\n", numframes);
-
-       mod->numframes = numframes;
-
-       in = (byte *)(pin + 1);
-       i = in[0] + in[1] * 256;
-       if (i != 256)
-               Host_Error ("Mod_LoadHLSprite: unexpected number of palette colors %i (should be 256)", i);
-       in += 2;
-       switch(rendermode)
+       // LordHavoc: hack to allow sprites to be non-fullbright
+       fullbright = true;
+       for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++)
+               if (loadmodel->name[i] == '!')
+                       fullbright = false;
+
+       loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+       loadmodel->sprite.sprdata_frames = (mspriteframe_t *)Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * loadmodel->numframes);
+       loadmodel->num_textures = loadmodel->numframes;
+       loadmodel->num_texturesperskin = 1;
+       loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, sizeof(texture_t) * loadmodel->num_textures);
+
+       modelradius = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
        {
-       case SPRHL_NORMAL:
-               for (i = 0;i < 256;i++)
-               {
-                       palette[i][0] = *in++;
-                       palette[i][1] = *in++;
-                       palette[i][2] = *in++;
-                       palette[i][3] = 255;
-               }
-               palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
-               break;
-       case SPRHL_ADDITIVE:
-               for (i = 0;i < 256;i++)
-               {
-                       palette[i][0] = *in++;
-                       palette[i][1] = *in++;
-                       palette[i][2] = *in++;
-                       palette[i][3] = 255;
-               }
-//             palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
-               mod->flags |= EF_ADDITIVE;
-               break;
-       case SPRHL_INDEXALPHA:
-               for (i = 0;i < 256;i++)
-               {
-                       palette[i][0] = 255;
-                       palette[i][1] = 255;
-                       palette[i][2] = 255;
-                       palette[i][3] = i;
-                       in += 3;
-               }
-               break;
-       case SPRHL_ALPHATEST:
-               for (i = 0;i < 256;i++)
-               {
-                       palette[i][0] = *in++;
-                       palette[i][1] = *in++;
-                       palette[i][2] = *in++;
-                       palette[i][3] = 255;
-               }
-               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);
-               return;
+               int origin[2], x, y, width, height;
+               const dsprite2frame_t *pinframe;
+               mspriteframe_t *sprframe;
+
+               dpsnprintf(loadmodel->animscenes[i].name, sizeof(loadmodel->animscenes[i].name), "frame %i", i);
+               loadmodel->animscenes[i].firstframe = i;
+               loadmodel->animscenes[i].framecount = 1;
+               loadmodel->animscenes[i].framerate = 10;
+               loadmodel->animscenes[i].loop = true;
+
+               pinframe = &pinqsprite->frames[i];
+
+               origin[0] = LittleLong (pinframe->origin_x);
+               origin[1] = LittleLong (pinframe->origin_y);
+               width = LittleLong (pinframe->width);
+               height = LittleLong (pinframe->height);
+
+               sprframe = &loadmodel->sprite.sprdata_frames[i];
+
+               // note that sp2 origin[0] is positive, where as it is negative in
+               // spr/spr32/hlspr
+               sprframe->left = -origin[0];
+               sprframe->right = -origin[0] + width;
+               sprframe->up = origin[1];
+               sprframe->down = origin[1] - height;
+
+               x = (int)max(sprframe->left * sprframe->left, sprframe->right * sprframe->right);
+               y = (int)max(sprframe->up * sprframe->up, sprframe->down * sprframe->down);
+               if (modelradius < x + y)
+                       modelradius = x + y;
        }
 
-       pframetype = (dspriteframetype_t *)in;
-
-       animscenes = Hunk_AllocName(sizeof(animscene_t) * mod->numframes, va("%s sceneinfo", loadname));
-
-       realframes = 0;
-
-       for (i = 0;i < numframes;i++)
+       if (cls.state != ca_dedicated)
        {
-               spriteframetype_t       frametype;
-
-               frametype = LittleLong (pframetype->type);
-
-               sprintf(animscenes[i].name, "frame%i", i);
-               animscenes[i].firstframe = realframes;
-               animscenes[i].loop = true;
-               if (frametype == SPR_SINGLE)
+               for (i = 0;i < loadmodel->numframes;i++)
                {
-                       animscenes[i].framecount = 1;
-                       animscenes[i].framerate = 10;
-                       pframe = (dspriteframe_t *) (pframetype + 1);
-                       framedata[realframes] = pframe;
-                       size = LittleLong(pframe->width) * LittleLong(pframe->height);
-                       pframetype = (dspriteframetype_t *) (size + sizeof(dspriteframe_t) + (int) pframe);
-                       realframes++;
-               }
-               else
-               {
-                       j = LittleLong(((dspritegroup_t *) (sizeof(dspriteframetype_t) + (int) pframetype))->numframes);
-                       animscenes[i].framecount = j;
-                       // FIXME: support variable framerate?
-                       animscenes[i].framerate = 1.0f / LittleFloat(((dspriteinterval_t *) (sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype))->interval);
-                       pframe = (dspriteframe_t *) (sizeof(dspriteinterval_t) * j + sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype);
-                       while (j--)
+                       const dsprite2frame_t *pinframe;
+                       pinframe = &pinqsprite->frames[i];
+                       if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false, false)))
                        {
-                               framedata[realframes] = pframe;
-                               size = LittleLong(pframe->width) * LittleLong(pframe->height);
-                               pframe = (dspriteframe_t *) (size + sizeof(dspriteframe_t) + (int) pframe);
-                               realframes++;
+                               Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
+                               skinframe = R_SkinFrame_LoadMissing();
                        }
-                       pframetype = (dspriteframetype_t *) pframe;
+                       Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
                }
        }
 
-       mod->ofs_scenes = (int) animscenes - (int) psprite;
-
-       frames = Hunk_AllocName(sizeof(mspriteframe_t) * realframes, va("%s frames", loadname));
-
-       realframes = 0;
-       for (i = 0;i < numframes;i++)
+       modelradius = sqrt(modelradius);
+       for (i = 0;i < 3;i++)
        {
-               for (j = 0;j < animscenes[i].framecount;j++)
-               {
-                       Mod_LoadSpriteFrame (framedata[realframes], frames + realframes, i, 1, &palette[0][0]);
-                       realframes++;
-               }
+               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;
 
-       psprite->ofs_frames = (int) frames - (int) psprite;
-
-       qfree(framedata);
-
-       mod->type = mod_sprite;
-
-// move the complete, relocatable sprite model to the cache
-       end = Hunk_LowMark ();
-       mod->cachesize = total = end - start;
-
-       Cache_Alloc (&mod->cache, total, loadname);
-       if (!mod->cache.data)
-               return;
-       memcpy (mod->cache.data, psprite, total);
-
-       Hunk_FreeToLowMark (start);
-}
-
-
-/*
-=================
-Mod_LoadSpriteModel
-=================
-*/
-void Mod_LoadSpriteModel (model_t *mod, void *buffer)
-{
-       int version;
-       version = ((dsprite_t *)buffer)->version;
-       switch(version)
-       {
-       case SPRITEHL_VERSION:
-               Mod_LoadHLSprite (mod, buffer);
-               break;
-       case SPRITE_VERSION:
-       case SPRITE32_VERSION:
-               Mod_LoadQuakeSprite(mod, buffer);
-               break;
-       default:
-               Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", mod->name, version);
-               break;
-       }
+       // TODO: Note that isanimated only means whether vertices change due to
+       // the animation. This may happen due to sprframe parameters changing.
+       // Mere texture chanegs OTOH shouldn't require isanimated to be 1.
+       loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1);
 }