// on the same machine.
#include "quakedef.h"
+#include "image.h"
cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
}
loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
- loadmodel->sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
+ loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
datapointer = startframes;
realframes = 0;
width = LittleLong (pinframe->width);
height = LittleLong (pinframe->height);
- loadmodel->sprdata_frames[realframes].left = origin[0];
- loadmodel->sprdata_frames[realframes].right = origin[0] + width;
- loadmodel->sprdata_frames[realframes].up = origin[1];
- loadmodel->sprdata_frames[realframes].down = origin[1] - height;
+ 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;
- x = max(loadmodel->sprdata_frames[realframes].left * loadmodel->sprdata_frames[realframes].left, loadmodel->sprdata_frames[realframes].right * loadmodel->sprdata_frames[realframes].right);
- y = max(loadmodel->sprdata_frames[realframes].up * loadmodel->sprdata_frames[realframes].up, loadmodel->sprdata_frames[realframes].down * loadmodel->sprdata_frames[realframes].down);
+ x = 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 = 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;
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].fogtexture = image_masktex;
+ loadmodel->sprite.sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE);
+ loadmodel->sprite.sprdata_frames[realframes].fogtexture = image_masktex;
- if (!loadmodel->sprdata_frames[realframes].texture)
+ if (!loadmodel->sprite.sprdata_frames[realframes].texture)
{
pixbuf = Mem_Alloc(tempmempool, width*height*4);
if (version == SPRITE32_VERSION)
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->sprite.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++)
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->sprite.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);
}
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;
}
-/*
-=================
-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;
datapointer = buffer;
- loadmodel->Draw = R_DrawSpriteModel;
loadmodel->DrawSky = 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)
datapointer += sizeof(dsprite_t);
loadmodel->numframes = LittleLong (pinqsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinqsprite->type);
+ loadmodel->sprite.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)
{
datapointer += sizeof(dspritehl_t);
loadmodel->numframes = LittleLong (pinhlsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinhlsprite->type);
+ loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type);
loadmodel->synctype = LittleLong (pinhlsprite->synctype);
rendermode = pinhlsprite->rendermode;
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)
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);
}