X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=2cdb741ab433214ed6d607a8aa6ec2999b65873b;hb=682c13beba95014c89c25f8ebec398a32a831d83;hp=30a7ec4b6b9df8a0df9155924eb953d9ae28f248;hpb=76ed5d5ee3a2517bfae3df09fb0b8d912f7286bc;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 30a7ec4b..2cdb741a 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -25,8 +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", "mipmaps skins (so they become blurrier in the distance), unlike skins the sprites do not have strange border colors"}; +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"}; /* =============== @@ -37,6 +39,8 @@ void Mod_SpriteInit (void) { Cvar_RegisterVariable(&r_mipsprites); Cvar_RegisterVariable(&r_picmipsprites); + Cvar_RegisterVariable(&r_labelsprites_scale); + Cvar_RegisterVariable(&r_labelsprites_roundtopixels); } static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive) @@ -55,7 +59,7 @@ static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, q 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) +static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, qboolean additive) { int i, j, groupframes, realframes, x, y, origin[2], width, height, fullbright; dspriteframetype_t *pinframetype; @@ -170,24 +174,43 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version if (modelradius < x + y) modelradius = x + y; - if (width > 0 && height > 0 && cls.state != ca_dedicated) + if (cls.state != ca_dedicated) { skinframe = NULL; - if (groupframes > 1) - sprintf (name, "%s_%i_%i", loadmodel->name, i, j); - else - sprintf (name, "%s_%i", loadmodel->name, i); - if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags))) + // note: Nehahra's null.spr has width == 0 and height == 0 + if (width > 0 && height > 0) { if (groupframes > 1) + { + sprintf (name, "%s_%i_%i", loadmodel->name, i, j); sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j); + } else + { + sprintf (name, "%s_%i", loadmodel->name, i); 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 = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false))) + { + unsigned char *pixels = Mem_Alloc(loadmodel->mempool, width*height*4); + if (version == SPRITE32_VERSION) + { + for (x = 0;x < width*height;x++) + { + pixels[x*4+2] = datapointer[x*4+0]; + pixels[x*4+1] = datapointer[x*4+1]; + pixels[x*4+0] = datapointer[x*4+2]; + pixels[x*4+3] = datapointer[x*4+3]; + } + } + else //if (version == SPRITEHL_VERSION || version == SPRITE_VERSION) + Image_Copy8bitBGRA(datapointer, pixels, width*height, palette ? palette : palette_bgra_transparent); + skinframe = R_SkinFrame_LoadInternalBGRA(name, texflags, pixels, width, height); + Mem_Free(pixels); + } } + if (skinframe == NULL) + skinframe = R_SkinFrame_LoadMissing(); Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive); } @@ -217,13 +240,17 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) datapointer = (unsigned char *)buffer; + loadmodel->modeldatatypestring = "SPR1"; + loadmodel->type = mod_sprite; 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) @@ -237,12 +264,12 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type); loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype); - Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, NULL, false); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, false); } else if (version == SPRITEHL_VERSION) { int i, rendermode; - unsigned char palette[256][4], alphapalette[256][4]; + unsigned char palette[256][4]; const unsigned char *in; dspritehl_t *pinhlsprite; @@ -266,18 +293,18 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) case SPRHL_OPAQUE: for (i = 0;i < 256;i++) { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; + palette[i][2] = in[i*3+0]; + palette[i][1] = in[i*3+1]; + palette[i][0] = in[i*3+2]; palette[i][3] = 255; } break; case SPRHL_ADDITIVE: for (i = 0;i < 256;i++) { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; + palette[i][2] = in[i*3+0]; + palette[i][1] = in[i*3+1]; + palette[i][0] = in[i*3+2]; palette[i][3] = 255; } // also passes additive == true to Mod_Sprite_SharedSetup @@ -285,9 +312,9 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) case SPRHL_INDEXALPHA: for (i = 0;i < 256;i++) { - palette[i][0] = in[765]; + palette[i][2] = in[765]; palette[i][1] = in[766]; - palette[i][2] = in[767]; + palette[i][0] = in[767]; palette[i][3] = i; in += 3; } @@ -295,9 +322,9 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) case SPRHL_ALPHATEST: for (i = 0;i < 256;i++) { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; + palette[i][2] = in[i*3+0]; + palette[i][1] = in[i*3+1]; + palette[i][0] = in[i*3+2]; palette[i][3] = 255; } palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; @@ -308,15 +335,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) return; } - 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), (unsigned int *)(&palette[0][0]), (unsigned int *)(&alphapalette[0][0]), rendermode == SPRHL_ADDITIVE); + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[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", @@ -330,15 +349,19 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) const dsprite2_t *pinqsprite; skinframe_t *skinframe; float modelradius; - int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE; + 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->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; @@ -405,7 +428,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) { const dsprite2frame_t *pinframe; pinframe = &pinqsprite->frames[i]; - if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags))) + if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false))) { Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name); skinframe = R_SkinFrame_LoadMissing();