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(qbyte *datapointer, int version, int *palette, 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;
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;
+ loadmodel->flags2 = 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;
}
}
}
loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
- loadmodel->sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
+ loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
datapointer = startframes;
realframes = 0;
width = LittleLong (pinframe->width);
height = LittleLong (pinframe->height);
- loadmodel->sprdata_frames[realframes].left = origin[0];
- loadmodel->sprdata_frames[realframes].right = origin[0] + width;
- loadmodel->sprdata_frames[realframes].up = origin[1];
- loadmodel->sprdata_frames[realframes].down = origin[1] - height;
+ loadmodel->sprite.sprdata_frames[realframes].left = origin[0];
+ loadmodel->sprite.sprdata_frames[realframes].right = origin[0] + width;
+ loadmodel->sprite.sprdata_frames[realframes].up = origin[1];
+ loadmodel->sprite.sprdata_frames[realframes].down = origin[1] - height;
- x = max(loadmodel->sprdata_frames[realframes].left * loadmodel->sprdata_frames[realframes].left, loadmodel->sprdata_frames[realframes].right * loadmodel->sprdata_frames[realframes].right);
- y = max(loadmodel->sprdata_frames[realframes].up * loadmodel->sprdata_frames[realframes].up, loadmodel->sprdata_frames[realframes].down * loadmodel->sprdata_frames[realframes].down);
+ 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);
if (modelradius < x + y)
modelradius = x + y;
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->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE);
- loadmodel->sprdata_frames[realframes].fogtexture = image_masktex;
+ 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->sprdata_frames[realframes].texture)
+ 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->sprdata_frames[realframes].texture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | 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->sprdata_frames[realframes].fogtexture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE, NULL);
-
- Mem_Free(pixbuf);
}
}
loadmodel->radius2 = modelradius * modelradius;
}
-/*
-=================
-Mod_LoadSpriteModel
-=================
-*/
extern void R_Model_Sprite_Draw(entity_render_t *ent);
-void Mod_LoadSpriteModel (model_t *mod, void *buffer)
+void Mod_IDSP_Load(model_t *mod, void *buffer)
{
int version, i, rendermode;
- qbyte palette[256][4], *in;
+ qbyte palette[256][4], alphapalette[256][4], *in;
dsprite_t *pinqsprite;
dspritehl_t *pinhlsprite;
qbyte *datapointer;
loadmodel->DrawSky = NULL;
loadmodel->Draw = R_Model_Sprite_Draw;
- loadmodel->DrawFakeShadow = NULL;
- loadmodel->DrawBaseLighting = NULL;
loadmodel->DrawShadowVolume = NULL;
loadmodel->DrawLight = NULL;
datapointer += sizeof(dsprite_t);
loadmodel->numframes = LittleLong (pinqsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinqsprite->type);
+ 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)
{
datapointer += sizeof(dspritehl_t);
loadmodel->numframes = LittleLong (pinhlsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinhlsprite->type);
+ loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type);
loadmodel->synctype = LittleLong (pinhlsprite->synctype);
rendermode = pinhlsprite->rendermode;
datapointer += 2;
i = in[0] + in[1] * 256;
if (i != 256)
- Host_Error ("Mod_LoadHLSprite: unexpected number of palette colors %i (should be 256)", i);
+ Host_Error ("Mod_IDSP_Load: unexpected number of palette colors %i (should be 256)", i);
in = datapointer;
datapointer += 768;
switch(rendermode)
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[0][0] = palette[0][1] = palette[0][2] = palette[0][3] = 0;
break;
default:
- Host_Error("Mod_LoadHLSprite: 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)\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_LoadSpriteModel: %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 should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
}
projects / xonotic / darkplaces.git / blobdiff