X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=043f9fd2eca0b15a6bb6598cceaa54238c8e1dfe;hb=82d719d14af6c155b13ef58c5fe22772d8cb74bc;hp=5d82993dbb79d4bdb689d227bcd3e7b16f06ee2c;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 5d82993d..043f9fd2 100644 --- 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(long 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; @@ -61,7 +62,7 @@ void Mod_Sprite_SharedSetup(long datapointer, int version, int *palette) float modelradius, interval; char tempname[MAX_QPATH], name[MAX_QPATH]; qbyte *pixbuf; - long startframes; + void *startframes; modelradius = 0; Mod_Sprite_StripExtension(loadmodel->name, tempname); @@ -120,7 +121,7 @@ void Mod_Sprite_SharedSetup(long datapointer, int version, int *palette) } 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; @@ -165,47 +166,50 @@ void Mod_Sprite_SharedSetup(long datapointer, int version, int *palette) 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; - if (groupframes > 1) - 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; - - if (!loadmodel->sprdata_frames[realframes].texture) + if (width > 0 && height > 0) { - pixbuf = Mem_Alloc(tempmempool, width*height*4); - if (version == SPRITE32_VERSION) - memcpy(pixbuf, (qbyte *)datapointer, width*height*4); - else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) - Image_Copy8bitRGBA((qbyte *)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); - - // make fog version (just alpha) - for (k = 0;k < width*height;k++) - { - pixbuf[k*4+0] = 255; - pixbuf[k*4+1] = 255; - pixbuf[k*4+2] = 255; - } if (groupframes > 1) - sprintf (name, "%s_%i_%ifog", tempname, i, j); + sprintf (name, "%s_%i_%i", 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); + sprintf (name, "%s_%i", tempname, i); + 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; - Mem_Free(pixbuf); + if (!loadmodel->sprite.sprdata_frames[realframes].texture) + { + pixbuf = Mem_Alloc(tempmempool, width*height*4); + if (version == SPRITE32_VERSION) + memcpy(pixbuf, datapointer, width*height*4); + else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette); + + 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++) + { + pixbuf[k*4+0] = 255; + pixbuf[k*4+1] = 255; + pixbuf[k*4+2] = 255; + } + if (groupframes > 1) + sprintf (name, "%s_%i_%ifog", tempname, i, j); + else + sprintf (name, "%s_%ifog", tempname, i); + 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); + } } if (version == SPRITE32_VERSION) @@ -222,68 +226,55 @@ void Mod_Sprite_SharedSetup(long 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->modelradius = modelradius; + loadmodel->radius = modelradius; + loadmodel->radius2 = modelradius * modelradius; } -void Mod_Sprite_SERAddEntity(void) +extern void R_Model_Sprite_Draw(entity_render_t *ent); +void Mod_IDSP_Load(model_t *mod, void *buffer) { - R_ClipSprite(); -} + int version, i, rendermode; + qbyte palette[256][4], *in; + dsprite_t *pinqsprite; + dspritehl_t *pinhlsprite; + qbyte *datapointer; + datapointer = buffer; -/* -================= -Mod_LoadSpriteModel -================= -*/ -void Mod_LoadSpriteModel (model_t *mod, void *buffer) -{ - int version; - 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) { - dsprite_t *pinsprite; - long datapointer; - - datapointer = (long) buffer; - - pinsprite = (dsprite_t *)datapointer; + pinqsprite = (dsprite_t *)datapointer; datapointer += sizeof(dsprite_t); - loadmodel->numframes = LittleLong (pinsprite->numframes); - loadmodel->sprnum_type = LittleLong (pinsprite->type); - loadmodel->synctype = LittleLong (pinsprite->synctype); + loadmodel->numframes = LittleLong (pinqsprite->numframes); + loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type); + loadmodel->synctype = LittleLong (pinqsprite->synctype); - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinsprite->version), d_8to24table); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete); } else if (version == SPRITEHL_VERSION) { - int i, rendermode; - qbyte palette[256][4], *in; - dspritehl_t *pinsprite; - long datapointer; - - datapointer = (long) buffer; - - pinsprite = (dspritehl_t *)datapointer; + pinhlsprite = (dspritehl_t *)datapointer; datapointer += sizeof(dspritehl_t); - loadmodel->numframes = LittleLong (pinsprite->numframes); - loadmodel->sprnum_type = LittleLong (pinsprite->type); - loadmodel->synctype = LittleLong (pinsprite->synctype); - rendermode = pinsprite->rendermode; + loadmodel->numframes = LittleLong (pinhlsprite->numframes); + loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type); + loadmodel->synctype = LittleLong (pinhlsprite->synctype); + rendermode = pinhlsprite->rendermode; - in = (qbyte *)datapointer; + in = datapointer; 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); - in = (qbyte *)datapointer; + Host_Error ("Mod_IDSP_Load: unexpected number of palette colors %i (should be 256)", i); + in = datapointer; datapointer += 768; switch(rendermode) { @@ -305,7 +296,6 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer) palette[i][2] = *in++; palette[i][3] = 255; } - // palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; loadmodel->flags |= EF_ADDITIVE; break; case SPRHL_INDEXALPHA: @@ -329,12 +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 (pinsprite->version), (int *)(&palette[0][0])); + 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); } +