X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=3827ab2d49b128d26ba8f3e0e766758b62ca18ce;hb=fb50a9a778603419fe35c6c6fbb018b3bcff7783;hp=49c793381f90360e9a397ae615cac5d6c947bf9c;hpb=5223fd4fddfd87e6b4a71683810e6955fd5f9913;p=xonotic%2Fdarkplaces.git diff --git a/model_sprite.c b/model_sprite.c index 49c79338..3827ab2d 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -27,6 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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,27 +39,38 @@ 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) { if (!skinframe) skinframe = R_SkinFrame_LoadMissing(); - texture->basematerialflags = MATERIALFLAG_WALL | MATERIALFLAG_NOCULLFACE; + texture->offsetmapping = OFFSETMAPPING_OFF; + texture->offsetscale = 1; + texture->specularscalemod = 1; + texture->specularpowermod = 1; + texture->basematerialflags = MATERIALFLAG_WALL; if (fullbright) texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT; if (additive) texture->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; - else if (skinframe->fog) + else if (skinframe->hasalpha) texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; texture->currentmaterialflags = texture->basematerialflags; texture->numskinframes = 1; texture->currentskinframe = texture->skinframes[0] = skinframe; + texture->surfaceflags = 0; + texture->supercontents = SUPERCONTENTS_SOLID; + if (!(texture->basematerialflags & MATERIALFLAG_BLENDED)) + texture->supercontents |= SUPERCONTENTS_OPAQUE; } -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; + int i, j, groupframes, realframes, x, y, origin[2], width, height; + qboolean fullbright; dspriteframetype_t *pinframetype; dspriteframe_t *pinframe; dspritegroup_t *pingroup; @@ -66,7 +79,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version float modelradius, interval; char name[MAX_QPATH], fogname[MAX_QPATH]; const void *startframes; - 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_ALPHA | TEXF_CLAMP; modelradius = 0; if (loadmodel->numframes < 1) @@ -144,7 +157,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version Host_Error("Mod_Sprite_SharedSetup: invalid interval"); } - sprintf(loadmodel->animscenes[i].name, "frame %i", i); + dpsnprintf(loadmodel->animscenes[i].name, sizeof(loadmodel->animscenes[i].name), "frame %i", i); loadmodel->animscenes[i].firstframe = realframes; loadmodel->animscenes[i].framecount = groupframes; loadmodel->animscenes[i].framerate = 1.0f / interval; @@ -177,19 +190,32 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version if (width > 0 && height > 0) { if (groupframes > 1) - sprintf (name, "%s_%i_%i", loadmodel->name, i, j); + { + dpsnprintf (name, sizeof(name), "%s_%i_%i", loadmodel->name, i, j); + dpsnprintf (fogname, sizeof(fogname), "%s_%i_%ifog", loadmodel->name, i, j); + } else - sprintf (name, "%s_%i", loadmodel->name, i); - if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false))) { - if (groupframes > 1) - sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j); - else - sprintf (fogname, "%s_%ifog", loadmodel->name, i); + dpsnprintf (name, sizeof(name), "%s_%i", loadmodel->name, i); + dpsnprintf (fogname, sizeof(fogname), "%s_%ifog", loadmodel->name, i); + } + if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false))) + { + unsigned char *pixels = (unsigned char *) Mem_Alloc(loadmodel->mempool, width*height*4); 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); + { + 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) @@ -216,13 +242,15 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version } extern void R_Model_Sprite_Draw(entity_render_t *ent); -void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) +void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend) { int version; const unsigned char *datapointer; datapointer = (unsigned char *)buffer; + loadmodel->modeldatatypestring = "SPR1"; + loadmodel->type = mod_sprite; loadmodel->DrawSky = NULL; @@ -231,6 +259,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend) 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) @@ -244,12 +273,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; @@ -273,18 +302,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 @@ -292,9 +321,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; } @@ -302,9 +331,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; @@ -315,29 +344,26 @@ 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", loadmodel->name, version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION); + + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1; } -void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) +void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend) { - int i, version, fullbright; + int i, version; + qboolean 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_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; + + loadmodel->modeldatatypestring = "SPR2"; loadmodel->type = mod_sprite; @@ -347,6 +373,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->CompileShadowVolume = NULL; loadmodel->DrawShadowVolume = NULL; loadmodel->DrawLight = NULL; + loadmodel->DrawAddWaterPlanes = NULL; pinqsprite = (dsprite2_t *)buffer; @@ -430,4 +457,6 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend) } loadmodel->radius = modelradius; loadmodel->radius2 = modelradius * modelradius; + + loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1; }