// on the same machine.
#include "quakedef.h"
+#include "image.h"
cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
Cvar_RegisterVariable(&r_mipsprites);
}
-void Mod_Sprite_StripExtension(char *in, char *out)
+static void Mod_Sprite_StripExtension(char *in, char *out)
{
char *end;
end = in + strlen(in);
*out++ = 0;
}
-void Mod_Sprite_SharedSetup(long datapointer, int version, int *palette)
+static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
{
int i, j, k, groupframes, realframes, x, y, origin[2], width, height;
dspriteframetype_t *pinframetype;
float modelradius, interval;
char tempname[MAX_QPATH], name[MAX_QPATH];
qbyte *pixbuf;
- long startframes;
+ void *startframes;
modelradius = 0;
Mod_Sprite_StripExtension(loadmodel->name, tempname);
sprintf (name, "%s_%i_%i", tempname, i, j);
else
sprintf (name, "%s_%i", tempname, i);
- loadmodel->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, r_mipsprites.integer, true);
+ 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;
if (!loadmodel->sprdata_frames[realframes].texture)
{
pixbuf = Mem_Alloc(tempmempool, width*height*4);
if (version == SPRITE32_VERSION)
- memcpy(pixbuf, (qbyte *)datapointer, width*height*4);
+ memcpy(pixbuf, datapointer, width*height*4);
else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
- Image_Copy8bitRGBA((qbyte *)datapointer, pixbuf, width*height, palette);
+ Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette);
- loadmodel->sprdata_frames[realframes].texture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+ 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++)
sprintf (name, "%s_%i_%ifog", tempname, i, j);
else
sprintf (name, "%s_%ifog", tempname, i);
- loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+ 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->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius;
loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius;
}
-// loadmodel->modelradius = modelradius;
+ loadmodel->radius = modelradius;
+ loadmodel->radius2 = modelradius * modelradius;
}
-void Mod_Sprite_SERAddEntity(void)
-{
- R_ClipSprite();
-}
-
-
/*
=================
Mod_LoadSpriteModel
=================
*/
+extern void R_Model_Sprite_Draw(entity_render_t *ent);
void Mod_LoadSpriteModel (model_t *mod, void *buffer)
{
- int version;
- loadmodel->SERAddEntity = Mod_Sprite_SERAddEntity;
- loadmodel->Draw = R_DrawSpriteModel;
+ int version, i, rendermode;
+ qbyte palette[256][4], *in;
+ dsprite_t *pinqsprite;
+ dspritehl_t *pinhlsprite;
+ qbyte *datapointer;
+
+ datapointer = buffer;
+
loadmodel->DrawSky = NULL;
- loadmodel->DrawShadow = NULL;
+ loadmodel->Draw = R_Model_Sprite_Draw;
+ loadmodel->DrawFakeShadow = NULL;
+ loadmodel->DrawShadowVolume = NULL;
+ loadmodel->DrawLight = NULL;
version = LittleLong(((dsprite_t *)buffer)->version);
if (version == SPRITE_VERSION || SPRITE32_VERSION)
{
- dsprite_t *pinsprite;
- long datapointer;
-
- datapointer = (long) buffer;
-
- pinsprite = (dsprite_t *)datapointer;
+ pinqsprite = (dsprite_t *)datapointer;
datapointer += sizeof(dsprite_t);
- loadmodel->numframes = LittleLong (pinsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinsprite->type);
- loadmodel->synctype = LittleLong (pinsprite->synctype);
+ loadmodel->numframes = LittleLong (pinqsprite->numframes);
+ loadmodel->sprnum_type = LittleLong (pinqsprite->type);
+ loadmodel->synctype = LittleLong (pinqsprite->synctype);
- Mod_Sprite_SharedSetup(datapointer, LittleLong (pinsprite->version), d_8to24table);
+ Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete);
}
else if (version == SPRITEHL_VERSION)
{
- int i, rendermode;
- qbyte palette[256][4], *in;
- dspritehl_t *pinsprite;
- long datapointer;
-
- datapointer = (long) buffer;
-
- pinsprite = (dspritehl_t *)datapointer;
+ pinhlsprite = (dspritehl_t *)datapointer;
datapointer += sizeof(dspritehl_t);
- loadmodel->numframes = LittleLong (pinsprite->numframes);
- loadmodel->sprnum_type = LittleLong (pinsprite->type);
- loadmodel->synctype = LittleLong (pinsprite->synctype);
- rendermode = pinsprite->rendermode;
+ loadmodel->numframes = LittleLong (pinhlsprite->numframes);
+ loadmodel->sprnum_type = LittleLong (pinhlsprite->type);
+ loadmodel->synctype = LittleLong (pinhlsprite->synctype);
+ rendermode = pinhlsprite->rendermode;
- in = (qbyte *)datapointer;
+ in = datapointer;
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);
- in = (qbyte *)datapointer;
+ in = datapointer;
datapointer += 768;
switch(rendermode)
{
palette[i][2] = *in++;
palette[i][3] = 255;
}
- // palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
loadmodel->flags |= EF_ADDITIVE;
break;
case SPRHL_INDEXALPHA:
return;
}
- Mod_Sprite_SharedSetup(datapointer, LittleLong (pinsprite->version), (int *)(&palette[0][0]));
+ Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[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);
}
+
projects / xonotic / darkplaces.git / blobdiff