yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Share Mod_ReLoadSkins for reload images on model load

Browse source
This commit is contained in:
Denis Pauk 2022-10-17 22:35:01 +03:00
parent b2e8fbb086
commit b628fa9133
5 changed files with 64 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/client/refresh/files/models.c
View file

@ -260,3 +260,38 @@ Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
return extradata;
}
/*
=================
Mod_ReLoad
Reload images in SP2/MD2 (mark registration_sequence)
=================
*/
int
Mod_ReLoadSkins(struct image_s **skins, findimage_t find_image, void *extradata,
modtype_t type)
{
if (type == mod_sprite)
{
dsprite_t *sprout;
int i;
sprout = (dsprite_t *)extradata;
for (i=0 ; i<sprout->numframes ; i++)
skins[i] = find_image (sprout->frames[i].name, it_sprite);
return sprout->numframes;
}
else if (type == mod_alias)
{
dmdl_t *pheader;
int i;
pheader = (dmdl_t *)extradata;
for (i=0 ; i<pheader->num_skins ; i++)
skins[i] = find_image ((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME, it_skin);
return pheader->num_frames;
}
// Unknow format, no images associated with it
return 0;
}

32
src/client/refresh/gl1/gl1_model.c
View file

@ -1126,9 +1126,6 @@ struct model_s *
RI_RegisterModel(char *name)
{
model_t *mod;
int i;
dsprite_t *sprout;
dmdl_t *pheader;
mod = Mod_ForName(name, r_worldmodel, false);
@ -1137,35 +1134,22 @@ RI_RegisterModel(char *name)
mod->registration_sequence = registration_sequence;
/* register any images used by the models */
if (mod->type == mod_sprite)
if (mod->type == mod_brush)
{
sprout = (dsprite_t *)mod->extradata;
int i;
for (i = 0; i < sprout->numframes; i++)
{
mod->skins[i] = R_FindImage(sprout->frames[i].name, it_sprite);
}
}
else if (mod->type == mod_alias)
{
pheader = (dmdl_t *)mod->extradata;
for (i = 0; i < pheader->num_skins; i++)
{
mod->skins[i] = R_FindImage((char *)pheader + pheader->ofs_skins +
i * MAX_SKINNAME, it_skin);
}
mod->numframes = pheader->num_frames;
}
else if (mod->type == mod_brush)
{
for (i = 0; i < mod->numtexinfo; i++)
{
mod->texinfo[i].image->registration_sequence =
registration_sequence;
}
}
else
{
/* numframes is unused for SP2 but lets set it also */
mod->numframes = Mod_ReLoadSkins((struct image_s **)mod->skins,
(findimage_t)R_FindImage, mod->extradata, mod->type);
}
}
return mod;

31
src/client/refresh/gl3/gl3_model.c
View file

@ -1124,9 +1124,6 @@ struct model_s *
GL3_RegisterModel(char *name)
{
gl3model_t *mod;
int i;
dsprite_t *sprout;
dmdl_t *pheader;
mod = Mod_ForName(name, gl3_worldmodel, false);
@ -1135,33 +1132,21 @@ GL3_RegisterModel(char *name)
mod->registration_sequence = registration_sequence;
/* register any images used by the models */
if (mod->type == mod_sprite)
if (mod->type == mod_brush)
{
sprout = (dsprite_t *)mod->extradata;
int i;
for (i = 0; i < sprout->numframes; i++)
{
mod->skins[i] = GL3_FindImage(sprout->frames[i].name, it_sprite);
}
}
else if (mod->type == mod_alias)
{
pheader = (dmdl_t *)mod->extradata;
for (i = 0; i < pheader->num_skins; i++)
{
mod->skins[i] = GL3_FindImage((char *)pheader + pheader->ofs_skins + i * MAX_SKINNAME, it_skin);
}
mod->numframes = pheader->num_frames;
}
else if (mod->type == mod_brush)
{
for (i = 0; i < mod->numtexinfo; i++)
{
mod->texinfo[i].image->registration_sequence = registration_sequence;
}
}
else
{
/* numframes is unused for SP2 but lets set it also */
mod->numframes = Mod_ReLoadSkins((struct image_s **)mod->skins,
(findimage_t)GL3_FindImage, mod->extradata, mod->type);
}
}
return mod;

8
src/client/refresh/ref_shared.h
View file

@ -97,8 +97,10 @@ extern const byte* Mod_DecompressVis(const byte *in, int row);
typedef struct image_s* (*findimage_t)(char *name, imagetype_t type);
void *Mod_LoadMD2 (const char *mod_name, const void *buffer, int modfilelen,
vec3_t mins, vec3_t maxs, struct image_s **skins,
findimage_t findImage, modtype_t *type);
void *Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
struct image_s **skins, findimage_t findImage, modtype_t *type);
findimage_t find_image, modtype_t *type);
extern void *Mod_LoadSP2 (const char *mod_name, const void *buffer, int modfilelen,
struct image_s **skins, findimage_t find_image, modtype_t *type);
extern int Mod_ReLoadSkins(struct image_s **skins, findimage_t find_image,
void *extradata, modtype_t type);
#endif /* SRC_CLIENT_REFRESH_REF_SHARED_H_ */

27
src/client/refresh/soft/sw_model.c
View file

@ -1108,33 +1108,22 @@ RE_RegisterModel (char *name)
mod = Mod_ForName (name, r_worldmodel, false);
if (mod)
{
int i;
mod->registration_sequence = registration_sequence;
// register any images used by the models
if (mod->type == mod_sprite)
if (mod->type == mod_brush)
{
dsprite_t *sprout;
int i;
sprout = (dsprite_t *)mod->extradata;
for (i=0 ; i<sprout->numframes ; i++)
mod->skins[i] = R_FindImage (sprout->frames[i].name, it_sprite);
}
else if (mod->type == mod_alias)
{
dmdl_t *pheader;
pheader = (dmdl_t *)mod->extradata;
for (i=0 ; i<pheader->num_skins ; i++)
mod->skins[i] = R_FindImage ((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME, it_skin);
mod->numframes = pheader->num_frames;
}
else if (mod->type == mod_brush)
{
for (i=0 ; i<mod->numtexinfo ; i++)
mod->texinfo[i].image->registration_sequence = registration_sequence;
}
else
{
/* numframes is unused for SP2 but lets set it also */
mod->numframes = Mod_ReLoadSkins((struct image_s **)mod->skins,
(findimage_t)R_FindImage, mod->extradata, mod->type);
}
}
return mod;
}