X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=e833271eabe821223ac228565f88200915031c7e;hb=c84109c5284e467c72cd50f3bdfd866ed3fd86f9;hp=8aa39070d9e86ac2b350f42168b0f2e188c427ca;hpb=893e82ea54d7088f4ab5f941c09dd9d91714ffd6;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 8aa39070..e833271e 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "image.h" -cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"}; +cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps skins (so they become blurrier in the distance), unlike skins the sprites do not have strange border colors"}; /* =============== @@ -37,8 +37,7 @@ void Mod_SpriteInit (void) Cvar_RegisterVariable(&r_mipsprites); } -static int alphaonlytable[4] = {255 | 0x80000000, 255 | 0x80000000, 255 | 0x80000000, 3}; -static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette, int *alphapalette) +static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, const unsigned int *alphapalette) { int i, j, groupframes, realframes, x, y, origin[2], width, height; dspriteframetype_t *pinframetype; @@ -47,14 +46,11 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette dspriteinterval_t *pinintervals; float modelradius, interval; char name[MAX_QPATH], fogname[MAX_QPATH]; - qbyte *pixbuf; - void *startframes; + const void *startframes; modelradius = 0; if (loadmodel->numframes < 1) - Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes); - - loadmodel->type = mod_sprite; + Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d", loadmodel->numframes); // LordHavoc: hack to allow sprites to be non-fullbright for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++) @@ -66,10 +62,6 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette } } - // LordHavoc: 32bit textures - if (version != SPRITE_VERSION && version != SPRITE32_VERSION && version != SPRITEHL_VERSION) - Host_Error("Mod_Sprite_SharedSetup: unsupported version %i, only %i (quake), %i (HalfLife), and %i (sprite32) supported", version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION); - // // load the frames // @@ -103,10 +95,10 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette realframes += groupframes; } - loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); - loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes); + 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); - datapointer = startframes; + datapointer = (unsigned char *)startframes; realframes = 0; for (i = 0;i < loadmodel->numframes;i++) { @@ -154,40 +146,29 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette loadmodel->sprite.sprdata_frames[realframes].up = origin[1]; loadmodel->sprite.sprdata_frames[realframes].down = origin[1] - height; - 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); + 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; - if (width > 0 && height > 0) + if (width > 0 && height > 0 && cls.state != ca_dedicated) { if (groupframes > 1) sprintf (name, "%s_%i_%i", loadmodel->name, i, j); else sprintf (name, "%s_%i", loadmodel->name, 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 | TEXF_PICMIP); - loadmodel->sprite.sprdata_frames[realframes].fogtexture = image_masktex; + Mod_LoadSkinFrame(&loadmodel->sprite.sprdata_frames[realframes].skin, name, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, false, false); - if (!loadmodel->sprite.sprdata_frames[realframes].texture) + if (!loadmodel->sprite.sprdata_frames[realframes].skin.base) { if (groupframes > 1) sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j); else sprintf (fogname, "%s_%ifog", loadmodel->name, i); if (version == SPRITE32_VERSION) - { - loadmodel->sprite.sprdata_frames[realframes].texture = R_LoadTexture2D(loadmodel->texturepool, name, width, height, datapointer, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, NULL); - // make fog version (just alpha) - pixbuf = Mem_Alloc(tempmempool, width*height*4); - Image_CopyMux(pixbuf, datapointer, width, height, false, false, false, 4, 4, alphaonlytable); - loadmodel->sprite.sprdata_frames[realframes].fogtexture = R_LoadTexture2D(loadmodel->texturepool, fogname, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, NULL); - Mem_Free(pixbuf); - } + Mod_LoadSkinFrame_Internal(&loadmodel->sprite.sprdata_frames[realframes].skin, name, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, false, false, datapointer, width, height, 32, NULL, NULL); else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) - { - loadmodel->sprite.sprdata_frames[realframes].texture = R_LoadTexture2D(loadmodel->texturepool, name, width, height, datapointer, TEXTYPE_PALETTE, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, palette); - loadmodel->sprite.sprdata_frames[realframes].fogtexture = R_LoadTexture2D(loadmodel->texturepool, fogname, width, height, datapointer, TEXTYPE_PALETTE, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, alphapalette); - } + Mod_LoadSkinFrame_Internal(&loadmodel->sprite.sprdata_frames[realframes].skin, name, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, false, false, datapointer, width, height, 8, palette, alphapalette); } } @@ -210,43 +191,49 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette } extern void R_Model_Sprite_Draw(entity_render_t *ent); -void Mod_IDSP_Load(model_t *mod, void *buffer) +void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) { - int version, i, rendermode; - qbyte palette[256][4], alphapalette[256][4], *in; - dsprite_t *pinqsprite; - dspritehl_t *pinhlsprite; - qbyte *datapointer; + int version; + const unsigned char *datapointer; - datapointer = buffer; + datapointer = (unsigned char *)buffer; + loadmodel->type = mod_sprite; loadmodel->flags2 = EF_FULLBRIGHT; loadmodel->DrawSky = NULL; loadmodel->Draw = R_Model_Sprite_Draw; + loadmodel->CompileShadowVolume = NULL; loadmodel->DrawShadowVolume = NULL; loadmodel->DrawLight = NULL; version = LittleLong(((dsprite_t *)buffer)->version); if (version == SPRITE_VERSION || version == SPRITE32_VERSION) { + dsprite_t *pinqsprite; + pinqsprite = (dsprite_t *)datapointer; datapointer += sizeof(dsprite_t); loadmodel->numframes = LittleLong (pinqsprite->numframes); loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type); - loadmodel->synctype = LittleLong (pinqsprite->synctype); + loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype); - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete, palette_alpha); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, NULL); } else if (version == SPRITEHL_VERSION) { + int i, rendermode; + unsigned char palette[256][4], alphapalette[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 = LittleLong (pinhlsprite->synctype); + loadmodel->synctype = (synctype_t)LittleLong (pinhlsprite->synctype); rendermode = pinhlsprite->rendermode; in = datapointer; @@ -298,7 +285,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; break; default: - Host_Error("Mod_IDSP_Load: 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)", i); return; } @@ -310,9 +297,103 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) alphapalette[i][3] = palette[i][3]; } - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0]), (int *)(&alphapalette[0][0])); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[0][0]), (unsigned int *)(&alphapalette[0][0])); } else - Host_Error("Mod_IDSP_Load: %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). Only %i (quake), %i (HalfLife), and %i (sprite32) supported", + loadmodel->name, version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION); } + +void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) +{ + int i, version; + const dsprite2_t *pinqsprite; + float modelradius; + + loadmodel->type = mod_sprite; + loadmodel->flags2 = EF_FULLBRIGHT; + + loadmodel->DrawSky = NULL; + loadmodel->Draw = R_Model_Sprite_Draw; + loadmodel->CompileShadowVolume = NULL; + loadmodel->DrawShadowVolume = NULL; + loadmodel->DrawLight = NULL; + + pinqsprite = (dsprite2_t *)buffer; + + 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); + + 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; + + // Hack to allow sprites to be non-fullbright + for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++) + { + if (loadmodel->name[i] == '!') + { + loadmodel->flags2 &= ~EF_FULLBRIGHT; + break; + } + } + + 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); + + modelradius = 0; + for (i = 0;i < loadmodel->numframes;i++) + { + 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; + + if (width > 0 && height > 0 && cls.state != ca_dedicated) + { + Mod_LoadSkinFrame(&sprframe->skin, pinframe->name, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, false, false); + // TODO: use a default texture if we can't load it? + if (sprframe->skin.base == NULL) + Host_Error("Mod_IDS2_Load: failed to load %s", pinframe->name); + } + } + + 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; +}