X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=7d2960f5718476952fe326e8da314cb056ddaf8e;hb=c3a1653e58a354780cc920457b7b29482386cbb9;hp=06d1ce8622d48c6f6a43c1b11a0e4fc839bf2e90;hpb=11450dd2de8af9515052cf5e3e770757e8c3e483;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 06d1ce86..7d2960f5 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -37,56 +37,33 @@ void Mod_SpriteInit (void) Cvar_RegisterVariable(&r_mipsprites); } -static void Mod_Sprite_StripExtension(char *in, char *out) +static int alphaonlytable[4] = {255 | 0x80000000, 255 | 0x80000000, 255 | 0x80000000, 3}; +static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const int *palette, const int *alphapalette) { - 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; -} - -static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette) -{ - int i, j, k, groupframes, realframes, x, y, origin[2], width, height; + int i, j, groupframes, realframes, x, y, origin[2], width, height; dspriteframetype_t *pinframetype; dspriteframe_t *pinframe; dspritegroup_t *pingroup; dspriteinterval_t *pinintervals; float modelradius, interval; - char tempname[MAX_QPATH], name[MAX_QPATH]; + char name[MAX_QPATH], fogname[MAX_QPATH]; qbyte *pixbuf; - void *startframes; + const void *startframes; modelradius = 0; - Mod_Sprite_StripExtension(loadmodel->name, tempname); - if (loadmodel->numframes < 1) Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes); - loadmodel->type = mod_sprite; - loadmodel->flags = EF_FULLBRIGHT; - // LordHavoc: hack to allow sprites to be non-fullbright for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++) { if (loadmodel->name[i] == '!') { - loadmodel->flags &= ~EF_FULLBRIGHT; + loadmodel->flags2 &= ~EF_FULLBRIGHT; break; } } - // 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 // @@ -179,36 +156,32 @@ static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette if (width > 0 && height > 0) { if (groupframes > 1) - sprintf (name, "%s_%i_%i", tempname, i, j); + sprintf (name, "%s_%i_%i", loadmodel->name, i, j); else - 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); + 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; if (!loadmodel->sprite.sprdata_frames[realframes].texture) { - pixbuf = Mem_Alloc(tempmempool, width*height*4); + if (groupframes > 1) + sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j); + else + sprintf (fogname, "%s_%ifog", loadmodel->name, i); if (version == SPRITE32_VERSION) - memcpy(pixbuf, datapointer, width*height*4); + { + 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); + } 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; + 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); } - 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); } } @@ -231,24 +204,26 @@ 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, const void *buffer) { - int version, i, rendermode; - qbyte palette[256][4], *in; - dsprite_t *pinqsprite; - dspritehl_t *pinhlsprite; - qbyte *datapointer; + int version; + const qbyte *datapointer; datapointer = buffer; + loadmodel->type = mod_sprite; + loadmodel->flags2 = EF_FULLBRIGHT; + loadmodel->DrawSky = NULL; loadmodel->Draw = R_Model_Sprite_Draw; loadmodel->DrawShadowVolume = NULL; loadmodel->DrawLight = NULL; version = LittleLong(((dsprite_t *)buffer)->version); - if (version == SPRITE_VERSION || SPRITE32_VERSION) + if (version == SPRITE_VERSION || version == SPRITE32_VERSION) { + dsprite_t *pinqsprite; + pinqsprite = (dsprite_t *)datapointer; datapointer += sizeof(dsprite_t); @@ -256,10 +231,15 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type); loadmodel->synctype = LittleLong (pinqsprite->synctype); - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete, palette_alpha); } else if (version == SPRITEHL_VERSION) { + int i, rendermode; + qbyte palette[256][4], alphapalette[256][4]; + const qbyte *in; + dspritehl_t *pinhlsprite; + pinhlsprite = (dspritehl_t *)datapointer; datapointer += sizeof(dspritehl_t); @@ -277,15 +257,14 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) datapointer += 768; switch(rendermode) { - case SPRHL_NORMAL: - for (i = 0;i < 255;i++) + case SPRHL_OPAQUE: + 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++) @@ -295,36 +274,137 @@ void Mod_IDSP_Load(model_t *mod, void *buffer) palette[i][2] = *in++; palette[i][3] = 255; } - loadmodel->flags |= EF_ADDITIVE; + loadmodel->flags2 |= 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][0] = in[765]; + palette[i][1] = in[766]; + palette[i][2] = in[767]; palette[i][3] = i; in += 3; } break; case SPRHL_ALPHATEST: - for (i = 0;i < 255;i++) + 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; + 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); return; } - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0])); + for (i = 0;i < 256;i++) + { + alphapalette[i][0] = 255; + alphapalette[i][1] = 255; + alphapalette[i][2] = 255; + alphapalette[i][3] = palette[i][3]; + } + + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0]), (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, const void *buffer) +{ + 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->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\n", 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 = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); + loadmodel->sprite.sprdata_frames = 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]; + + sprframe->left = origin[0]; + sprframe->right = origin[0] + width; + sprframe->up = origin[1]; + sprframe->down = origin[1] - height; + + x = max(sprframe->left * sprframe->left, sprframe->right * sprframe->right); + y = max(sprframe->up * sprframe->up, sprframe->down * sprframe->down); + if (modelradius < x + y) + modelradius = x + y; + + if (width > 0 && height > 0) + { + sprframe->texture = loadtextureimagewithmask(loadmodel->texturepool, pinframe->name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP); + sprframe->fogtexture = image_masktex; + + // TODO: use a default texture if we can't load it? + if (sprframe->texture == 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; +}