#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_RegisterVariable(&r_picmipsprites);
}
-static void Mod_SpriteSetupTexture(mspriteframe_t *frame, qboolean fullbright, qboolean additive)
+static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive)
{
- texture_t *texture = &frame->texture;
+ 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 (texture->skinframes[0]->fog)
+ else if (skinframe->fog)
texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
texture->currentmaterialflags = texture->basematerialflags;
- texture->currentskinframe = texture->skinframes[0];
+ 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)
dspriteframe_t *pinframe;
dspritegroup_t *pingroup;
dspriteinterval_t *pinintervals;
+ skinframe_t *skinframe;
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_COMPRESS | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
modelradius = 0;
if (loadmodel->numframes < 1)
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 = (unsigned char *)startframes;
realframes = 0;
if (modelradius < x + y)
modelradius = x + y;
- if (width > 0 && height > 0 && cls.state != ca_dedicated)
+ 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);
- if (!(loadmodel->sprite.sprdata_frames[realframes].texture.skinframes[0] = R_SkinFrame_LoadExternal(name, texflags)))
+ 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.skinframes[0] = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
- else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
- loadmodel->sprite.sprdata_frames[realframes].texture.skinframes[0] = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
+ 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);
+ 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);
}
- Mod_SpriteSetupTexture(&loadmodel->sprite.sprdata_frames[realframes], fullbright, additive);
-
if (version == SPRITE32_VERSION)
datapointer += width * height * 4;
else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
datapointer = (unsigned char *)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;
{
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_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->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++)
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)
+ if (cls.state != ca_dedicated)
+ {
+ for (i = 0;i < loadmodel->numframes;i++)
{
- if (!(sprframe->texture.skinframes[0] = R_SkinFrame_LoadExternal(pinframe->name, texflags)))
+ 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);
- sprframe->texture.skinframes[0] = R_SkinFrame_LoadMissing();
+ skinframe = R_SkinFrame_LoadMissing();
}
+ Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
}
-
- Mod_SpriteSetupTexture(sprframe, fullbright, false);
}
modelradius = sqrt(modelradius);
projects / xonotic / darkplaces.git / blobdiff