yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

models: apply md3 compress tris logic

Browse source
This commit is contained in:
Denis Pauk 2024-03-13 22:32:35 +02:00
parent 0b5babdc53
commit 5675a7c28d
2 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1262,9 +1262,6 @@ Mod_LoadModel_MD3(const char *mod_name, const void *buffer, int modfilelen,
pheader->ofs_glcmds = ofs_glcmds;
pheader->ofs_end = ofs_end;
num_xyz = 0;
num_tris = 0;
baseglcmds = pglcmds = (int *)((byte *)pheader + pheader->ofs_glcmds);
dmdxmesh_t *mesh_nodes = (dmdxmesh_t *)((byte *)pheader + pheader->ofs_meshes);
dtriangle_t *tris = (dtriangle_t*)((byte *)pheader + pheader->ofs_tris);
@ -1272,6 +1269,8 @@ Mod_LoadModel_MD3(const char *mod_name, const void *buffer, int modfilelen,
dmdx_vert_t * vertx = malloc(pinmodel.num_frames * pheader->num_xyz * sizeof(dmdx_vert_t));
char *skin = (char *)pheader + pheader->ofs_skins;
num_xyz = 0;
num_tris = 0;
meshofs = pinmodel.ofs_meshes;
for (i = 0; i < pinmodel.num_meshes; i++)
{
@ -1302,9 +1301,8 @@ Mod_LoadModel_MD3(const char *mod_name, const void *buffer, int modfilelen,
/* load triangles */
p = (const int*)((byte*)buffer + meshofs + LittleLong(md3_mesh->ofs_tris));
mesh_nodes[i].ofs_glcmds = pglcmds - baseglcmds;
mesh_nodes[i].ofs_tris = num_tris;
mesh_nodes[i].num_tris = num_tris + LittleLong(md3_mesh->num_tris);
mesh_nodes[i].num_tris = LittleLong(md3_mesh->num_tris);
for (j = 0; j < LittleLong(md3_mesh->num_tris); j++)
{
@ -1321,16 +1319,6 @@ Mod_LoadModel_MD3(const char *mod_name, const void *buffer, int modfilelen,
}
}
/* write glcmds */
mesh_nodes[i].num_glcmds = Mod_LoadCmdCompress(
(dstvert_t*)((byte *)pheader + pheader->ofs_st),
(dtriangle_t*)((byte *)pheader + pheader->ofs_tris) + num_tris,
LittleLong(md3_mesh->num_tris),
pglcmds,
pheader->skinwidth, pheader->skinheight);
pglcmds += mesh_nodes[i].num_glcmds;
md3_vertex = (md3_vertex_t*)((byte*)buffer + meshofs + LittleLong(md3_mesh->ofs_verts));
for (k = 0; k < pinmodel.num_frames; k ++)
@ -1376,6 +1364,32 @@ Mod_LoadModel_MD3(const char *mod_name, const void *buffer, int modfilelen,
}
free(vertx);
Mod_LoadTrisCompress(pheader);
num_tris = 0;
meshofs = pinmodel.ofs_meshes;
for (i = 0; i < pinmodel.num_meshes; i++)
{
const md3_mesh_t *md3_mesh;
md3_mesh = (md3_mesh_t*)((byte*)buffer + meshofs);
mesh_nodes[i].ofs_glcmds = pglcmds - baseglcmds;
/* write glcmds */
mesh_nodes[i].num_glcmds = Mod_LoadCmdCompress(
(dstvert_t*)((byte *)pheader + pheader->ofs_st),
(dtriangle_t*)((byte *)pheader + pheader->ofs_tris) + num_tris,
LittleLong(md3_mesh->num_tris),
pglcmds,
pheader->skinwidth, pheader->skinheight);
pglcmds += mesh_nodes[i].num_glcmds;
meshofs += LittleLong(md3_mesh->ofs_end);
num_tris += LittleLong(md3_mesh->num_tris);
}
Mod_LoadFixImages(mod_name, pheader, false);
*type = mod_alias;

4
src/client/refresh/files/models_md5.c
View file

@ -1380,13 +1380,12 @@ Mod_LoadModel_MD5(const char *mod_name, const void *buffer, int modfilelen,
Mod_LoadTrisCompress(pheader);
num_tris = 0;
num_verts = 0;
for (i = 0; i < md5file->num_meshes; ++i)
{
mesh_nodes[i].ofs_glcmds = pglcmds - baseglcmds;
mesh_nodes[i].ofs_tris = num_tris;
mesh_nodes[i].num_tris = num_tris + md5file->meshes[i].num_tris;
mesh_nodes[i].num_tris = md5file->meshes[i].num_tris;
mesh_nodes[i].num_glcmds = Mod_LoadCmdCompress(
(dstvert_t*)((byte *)pheader + pheader->ofs_st),
@ -1397,7 +1396,6 @@ Mod_LoadModel_MD5(const char *mod_name, const void *buffer, int modfilelen,
pglcmds += mesh_nodes[i].num_glcmds;
num_verts += md5file->meshes[i].num_verts;
num_tris += md5file->meshes[i].num_tris;
}