X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.c;h=8fec8a66938bc44d579fe461f7b75c6e1843f2d9;hp=ec41b6e4dbe1acc9775c7d52e529c0af629a7313;hb=fc5fe8b95af8c3e314abe62dc0727e5bd2efa04a;hpb=9fa8ce6f31c95105ed4ac684b37f79f133b9c960 diff --git a/model_sprite.c b/model_sprite.c index ec41b6e4..8fec8a66 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -25,7 +25,10 @@ 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 sprites so they render faster in the distance and do not display noise artifacts"}; +cvar_t r_picmipsprites = {CVAR_SAVE, "r_picmipsprites", "1", "make gl_picmip affect sprites too (saves some graphics memory in sprite heavy games)"}; +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"}; /* =============== @@ -35,34 +38,49 @@ Mod_SpriteInit void Mod_SpriteInit (void) { Cvar_RegisterVariable(&r_mipsprites); + Cvar_RegisterVariable(&r_picmipsprites); + Cvar_RegisterVariable(&r_labelsprites_scale); + Cvar_RegisterVariable(&r_labelsprites_roundtopixels); } -static int alphaonlytable[4] = {255 | 0x80000000, 255 | 0x80000000, 255 | 0x80000000, 3}; -static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const unsigned int *palette, const unsigned int *alphapalette) +static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive) { - int i, j, groupframes, realframes, x, y, origin[2], width, height; + if (!skinframe) + skinframe = R_SkinFrame_LoadMissing(); + texture->basematerialflags = MATERIALFLAG_WALL; + if (fullbright) + texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT; + if (additive) + texture->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; + else if (skinframe->fog) + texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; + texture->currentmaterialflags = texture->basematerialflags; + texture->numskinframes = 1; + texture->currentskinframe = texture->skinframes[0] = skinframe; +} + +static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, const unsigned int *alphapalette, qboolean additive) +{ + int i, j, groupframes, realframes, x, y, origin[2], width, height, fullbright; dspriteframetype_t *pinframetype; dspriteframe_t *pinframe; dspritegroup_t *pingroup; dspriteinterval_t *pinintervals; + skinframe_t *skinframe; float modelradius, interval; char name[MAX_QPATH], fogname[MAX_QPATH]; - qbyte *pixbuf; const void *startframes; + int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE; modelradius = 0; if (loadmodel->numframes < 1) - Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes); + Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d", loadmodel->numframes); // 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] == '!') - { - loadmodel->flags2 &= ~EF_FULLBRIGHT; - break; - } - } + fullbright = false; // // load the frames @@ -97,10 +115,13 @@ static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const 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); + loadmodel->num_textures = realframes; + loadmodel->num_texturesperskin = 1; + loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, sizeof(texture_t) * loadmodel->num_textures); - datapointer = startframes; + datapointer = (unsigned char *)startframes; realframes = 0; for (i = 0;i < loadmodel->numframes;i++) { @@ -148,41 +169,36 @@ static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const 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 (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; - - if (!loadmodel->sprite.sprdata_frames[realframes].texture) + skinframe = NULL; + // note: Nehahra's null.spr has width == 0 and height == 0 + if (width > 0 && height > 0) { if (groupframes > 1) - sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j); + sprintf (name, "%s_%i_%i", 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); - } - else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + sprintf (name, "%s_%i", loadmodel->name, i); + if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false))) { - 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 (fogname, "%s_%i_%ifog", loadmodel->name, i, j); + else + sprintf (fogname, "%s_%ifog", loadmodel->name, i); + if (version == SPRITE32_VERSION) + skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL); + else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette); } } + if (skinframe == NULL) + skinframe = R_SkinFrame_LoadMissing(); + Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive); } if (version == SPRITE32_VERSION) @@ -207,18 +223,21 @@ extern void R_Model_Sprite_Draw(entity_render_t *ent); void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) { int version; - const qbyte *datapointer; + const unsigned char *datapointer; + + datapointer = (unsigned char *)buffer; - datapointer = buffer; + loadmodel->modeldatatypestring = "SPR1"; loadmodel->type = mod_sprite; - loadmodel->flags2 = EF_FULLBRIGHT; loadmodel->DrawSky = NULL; loadmodel->Draw = R_Model_Sprite_Draw; + loadmodel->DrawDepth = NULL; loadmodel->CompileShadowVolume = NULL; loadmodel->DrawShadowVolume = NULL; loadmodel->DrawLight = NULL; + loadmodel->DrawAddWaterPlanes = NULL; version = LittleLong(((dsprite_t *)buffer)->version); if (version == SPRITE_VERSION || version == SPRITE32_VERSION) @@ -230,15 +249,15 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) 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, false); } else if (version == SPRITEHL_VERSION) { int i, rendermode; - qbyte palette[256][4], alphapalette[256][4]; - const qbyte *in; + unsigned char palette[256][4], alphapalette[256][4]; + const unsigned char *in; dspritehl_t *pinhlsprite; pinhlsprite = (dspritehl_t *)datapointer; @@ -246,7 +265,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) 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; @@ -275,7 +294,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) palette[i][2] = *in++; palette[i][3] = 255; } - loadmodel->flags2 |= EF_ADDITIVE; + // also passes additive == true to Mod_Sprite_SharedSetup break; case SPRHL_INDEXALPHA: for (i = 0;i < 256;i++) @@ -296,9 +315,10 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) 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)\n", i); + Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)", i); return; } @@ -310,7 +330,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) alphapalette[i][3] = palette[i][3]; } - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[0][0]), (unsigned int *)(&alphapalette[0][0])); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[0][0]), (unsigned int *)(&alphapalette[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", @@ -320,18 +340,23 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) { - int i, version; + int i, version, fullbright; const dsprite2_t *pinqsprite; + skinframe_t *skinframe; float modelradius; + int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE; + + loadmodel->modeldatatypestring = "SPR2"; loadmodel->type = mod_sprite; - loadmodel->flags2 = EF_FULLBRIGHT; loadmodel->DrawSky = NULL; loadmodel->Draw = R_Model_Sprite_Draw; + loadmodel->DrawDepth = NULL; loadmodel->CompileShadowVolume = NULL; loadmodel->DrawShadowVolume = NULL; loadmodel->DrawLight = NULL; + loadmodel->DrawAddWaterPlanes = NULL; pinqsprite = (dsprite2_t *)buffer; @@ -341,22 +366,21 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->numframes = LittleLong (pinqsprite->numframes); if (loadmodel->numframes < 1) - Host_Error ("Mod_IDS2_Load: Invalid # of frames: %d\n", loadmodel->numframes); + 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 + // 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] == '!') - { - loadmodel->flags2 &= ~EF_FULLBRIGHT; - break; - } - } + fullbright = false; - loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); - loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * loadmodel->numframes); + 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++) @@ -380,24 +404,31 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) sprframe = &loadmodel->sprite.sprdata_frames[i]; - sprframe->left = origin[0]; - sprframe->right = origin[0] + width; + // 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 = max(sprframe->left * sprframe->left, sprframe->right * sprframe->right); - y = max(sprframe->up * sprframe->up, sprframe->down * sprframe->down); + 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) + if (cls.state != ca_dedicated) + { + for (i = 0;i < loadmodel->numframes;i++) { - 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); + const dsprite2frame_t *pinframe; + pinframe = &pinqsprite->frames[i]; + if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false))) + { + Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name); + skinframe = R_SkinFrame_LoadMissing(); + } + Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false); } }