nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 06:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR from GitHub: FRAMEGROUPS: add ability to specify explicit poses instead of the range. Thank you qqshka!

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6283 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Eukara 2022-07-20 01:08:51 +00:00
parent 8705adfb86
commit 03440263e2
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
engine/common/com_mesh.c
View file

@ -2877,8 +2877,12 @@ static void Mod_CompileTriangleNeighbours(model_t *loadmodel, galiasinfo_t *gali
} }
#endif #endif
#define MAX_FRAMEINFO_POSES 256
typedef struct typedef struct
{ {
unsigned int poses[MAX_FRAMEINFO_POSES];
qboolean posesarray;
unsigned int firstpose; unsigned int firstpose;
unsigned int posecount; unsigned int posecount;
float fps; float fps;
@ -2895,7 +2899,7 @@ static frameinfo_t *ParseFrameInfo(char *modelname, int *numgroups)
char *file; char *file;
frameinfo_t *frames = NULL; frameinfo_t *frames = NULL;
char fname[MAX_QPATH]; char fname[MAX_QPATH];
char tok[64]; char tok[MAX_FRAMEINFO_POSES * 4];
size_t fsize; size_t fsize;
com_tokentype_t ttype; com_tokentype_t ttype;
Q_snprintfz(fname, sizeof(fname), "%s.framegroups", modelname); Q_snprintfz(fname, sizeof(fname), "%s.framegroups", modelname);
@ -2904,6 +2908,8 @@ static frameinfo_t *ParseFrameInfo(char *modelname, int *numgroups)
return NULL; return NULL;
while(line && *line) while(line && *line)
{ {
unsigned int posecount = 0;
eol = strchr(line, '\n'); eol = strchr(line, '\n');
if (eol) if (eol)
*eol = 0; *eol = 0;
@ -2915,9 +2921,23 @@ static frameinfo_t *ParseFrameInfo(char *modelname, int *numgroups)
} }
line = COM_ParseOut(line, tok, sizeof(tok)); line = COM_ParseOut(line, tok, sizeof(tok));
frames[count].firstpose = atoi(tok); // Check if firstpose is actually a sequence of comma separated poses, e.g.: 42,43,44,43,42
if (strchr(tok, ','))
{
char pose[64], *ptok = tok;
for (; posecount < MAX_FRAMEINFO_POSES; posecount++)
{
ptok = COM_ParseStringSetSep(ptok, ',', pose, sizeof(pose));
if (!pose[0])
break;
frames[count].poses[posecount] = atoi(pose);
}
}
frames[count].posesarray = !!posecount;
frames[count].firstpose = posecount ? 0 : atoi(tok);
line = COM_ParseOut(line, tok, sizeof(tok)); line = COM_ParseOut(line, tok, sizeof(tok));
frames[count].posecount = atoi(tok); frames[count].posecount = posecount ? posecount : atoi(tok);
line = COM_ParseOut(line, tok, sizeof(tok)); line = COM_ParseOut(line, tok, sizeof(tok));
frames[count].fps = atof(tok); frames[count].fps = atof(tok);
line = COM_ParseOut(line, tok, sizeof(tok)); line = COM_ParseOut(line, tok, sizeof(tok));
@ -3983,7 +4003,10 @@ static void Mesh_HandleFramegroupsFile(model_t *mod, galiasinfo_t *galias)
o->poseofs = ZG_Malloc(&mod->memgroup, sizeof(*o->poseofs) * framegroups[a].posecount); o->poseofs = ZG_Malloc(&mod->memgroup, sizeof(*o->poseofs) * framegroups[a].posecount);
for (p = 0; p < framegroups[a].posecount; p++) for (p = 0; p < framegroups[a].posecount; p++)
{ {
targpose = framegroups[a].firstpose + p; if (framegroups[a].posesarray)
targpose = framegroups[a].poses[p];
else
targpose = framegroups[a].firstpose + p;
for (g = 0, frame = oldanims; g < oldnumanims; g++, frame++) for (g = 0, frame = oldanims; g < oldnumanims; g++, frame++)
{ {
if (targpose < frame->numposes) if (targpose < frame->numposes)
@ -6199,6 +6222,7 @@ static galiasinfo_t *Mod_LoadQ3ModelLod(model_t *mod, int *surfcount, void *buff
AddPointToBounds(min, mod->mins, mod->maxs); AddPointToBounds(min, mod->mins, mod->maxs);
AddPointToBounds(max, mod->mins, mod->maxs); AddPointToBounds(max, mod->mins, mod->maxs);
free(framegroups);
return first; return first;
} }
static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize) static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
@ -7228,6 +7252,7 @@ static qboolean QDECL Mod_LoadPSKModel(model_t *mod, void *buffer, size_t fsize)
animmatrix + (j+i)*12); animmatrix + (j+i)*12);
} }
} }
free(frameinfo);
} }
else else
{ {
@ -7722,6 +7747,8 @@ static qboolean QDECL Mod_LoadDarkPlacesModel(model_t *mod, void *buffer, size_t
mod->type = mod_alias; mod->type = mod_alias;
mod->funcs.NativeTrace = Mod_Trace; mod->funcs.NativeTrace = Mod_Trace;
free(framegroups);
return true; return true;
} }
#endif //DPMMODELS #endif //DPMMODELS
@ -8392,6 +8419,7 @@ static galiasinfo_t *Mod_ParseIQMMeshModel(model_t *mod, const char *buffer, siz
anim = (const struct iqmanim*)(buffer + h->ofs_anims); anim = (const struct iqmanim*)(buffer + h->ofs_anims);
for (i = 0; i < numgroups; i++) for (i = 0; i < numgroups; i++)
{ {
framegroups[i].posesarray = false;
framegroups[i].firstpose = LittleLong(anim[i].first_frame); framegroups[i].firstpose = LittleLong(anim[i].first_frame);
framegroups[i].posecount = LittleLong(anim[i].num_frames); framegroups[i].posecount = LittleLong(anim[i].num_frames);
framegroups[i].fps = LittleFloat(anim[i].framerate); framegroups[i].fps = LittleFloat(anim[i].framerate);
@ -8407,6 +8435,7 @@ static galiasinfo_t *Mod_ParseIQMMeshModel(model_t *mod, const char *buffer, siz
{ /*base frame only*/ { /*base frame only*/
numgroups = 1; numgroups = 1;
framegroups = malloc(sizeof(*framegroups)); framegroups = malloc(sizeof(*framegroups));
framegroups->posesarray = false;
framegroups->firstpose = -1; framegroups->firstpose = -1;
framegroups->posecount = 1; framegroups->posecount = 1;
framegroups->fps = 10; framegroups->fps = 10;