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

Share Mod_LoadQBSPNodes between renders

Browse source
This commit is contained in:
Denis Pauk 2023-10-07 15:24:02 +03:00
parent 1121407e39
commit d6de468c49
7 changed files with 38 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1404,12 +1404,7 @@ Mod_NumberLeafs(mleaf_t *leafs, mnode_t *node, int *r_leaftovis, int *r_vistolea
numvisleafs); numvisleafs);
} }
/* static void
=================
Mod_LoadNodes
=================
*/
void
Mod_LoadNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs, Mod_LoadNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs,
int numleafs, mnode_t **nodes, int *numnodes, const byte *mod_base, int numleafs, mnode_t **nodes, int *numnodes, const byte *mod_base,
const lump_t *l) const lump_t *l)
@ -1491,12 +1486,7 @@ Mod_LoadNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs,
Mod_NumberLeafs(leafs, *nodes, r_leaftovis, r_vistoleaf, &numvisleafs); Mod_NumberLeafs(leafs, *nodes, r_leaftovis, r_vistoleaf, &numvisleafs);
} }
/* static void
=================
Mod_LoadQNodes
=================
*/
void
Mod_LoadQNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs, Mod_LoadQNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs,
int numleafs, mnode_t **nodes, int *numnodes, const byte *mod_base, int numleafs, mnode_t **nodes, int *numnodes, const byte *mod_base,
const lump_t *l) const lump_t *l)
@ -1578,6 +1568,23 @@ Mod_LoadQNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs
Mod_NumberLeafs(leafs, *nodes, r_leaftovis, r_vistoleaf, &numvisleafs); Mod_NumberLeafs(leafs, *nodes, r_leaftovis, r_vistoleaf, &numvisleafs);
} }
void
Mod_LoadQBSPNodes(const char *name, cplane_t *planes, int numplanes, mleaf_t *leafs,
int numleafs, mnode_t **nodes, int *numnodes, const byte *mod_base,
const lump_t *l, int ident)
{
if (ident == IDBSPHEADER)
{
Mod_LoadNodes(name, planes, numplanes, leafs, numleafs, nodes, numnodes,
mod_base, l);
}
else
{
Mod_LoadQNodes(name, planes, numplanes, leafs, numleafs, nodes, numnodes,
mod_base, l);
}
}
/* /*
================= =================
Mod_LoadVisibility Mod_LoadVisibility

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

@ -800,18 +800,9 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen)
Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs, Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs,
mod->marksurfaces, mod->nummarksurfaces, mod_base, mod->marksurfaces, mod->nummarksurfaces, mod_base,
&header->lumps[LUMP_LEAFS], header->ident); &header->lumps[LUMP_LEAFS], header->ident);
if (header->ident == IDBSPHEADER) Mod_LoadQBSPNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
{ mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
Mod_LoadNodes(mod->name, mod->planes, mod->numplanes, mod->leafs, &header->lumps[LUMP_NODES], header->ident);
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
else
{
Mod_LoadQNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]);
mod->numframes = 2; /* regular and alternate animation */ mod->numframes = 2; /* regular and alternate animation */
} }

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

@ -766,18 +766,9 @@ Mod_LoadBrushModel(gl3model_t *mod, const void *buffer, int modfilelen)
Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs, Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs,
mod->marksurfaces, mod->nummarksurfaces, mod_base, mod->marksurfaces, mod->nummarksurfaces, mod_base,
&header->lumps[LUMP_LEAFS], header->ident); &header->lumps[LUMP_LEAFS], header->ident);
if (header->ident == IDBSPHEADER) Mod_LoadQBSPNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
{ mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
Mod_LoadNodes(mod->name, mod->planes, mod->numplanes, mod->leafs, &header->lumps[LUMP_NODES], header->ident);
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
else
{
Mod_LoadQNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]);
mod->numframes = 2; /* regular and alternate animation */ mod->numframes = 2; /* regular and alternate animation */
} }

4
src/client/refresh/gl4/gl4_model.c
View file

@ -534,9 +534,9 @@ Mod_LoadBrushModel(gl4model_t *mod, void *buffer, int modfilelen)
Mod_LoadMarksurfaces(mod, mod_base, &header->lumps[LUMP_LEAFFACES]); Mod_LoadMarksurfaces(mod, mod_base, &header->lumps[LUMP_LEAFFACES]);
Mod_LoadVisibility(&mod->vis, mod_base, &header->lumps[LUMP_VISIBILITY]); Mod_LoadVisibility(&mod->vis, mod_base, &header->lumps[LUMP_VISIBILITY]);
Mod_LoadLeafs(mod, mod_base, &header->lumps[LUMP_LEAFS]); Mod_LoadLeafs(mod, mod_base, &header->lumps[LUMP_LEAFS]);
Mod_LoadNodes(mod->name, mod->planes, mod->numplanes, mod->leafs, Mod_LoadQBSPNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base, mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]); &header->lumps[LUMP_NODES], header->ident);
Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]); Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]);
mod->numframes = 2; /* regular and alternate animation */ mod->numframes = 2; /* regular and alternate animation */
} }

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

@ -328,12 +328,12 @@ extern struct image_s *GetTexImage(const char *name, findimage_t find_image);
extern struct image_s *R_FindPic(const char *name, findimage_t find_image); extern struct image_s *R_FindPic(const char *name, findimage_t find_image);
extern struct image_s* R_LoadImage(const char *name, const char* namewe, const char *ext, extern struct image_s* R_LoadImage(const char *name, const char* namewe, const char *ext,
imagetype_t type, qboolean r_retexturing, loadimage_t load_image); imagetype_t type, qboolean r_retexturing, loadimage_t load_image);
extern void Mod_LoadNodes(const char *name, cplane_t *planes, int numplanes, extern void Mod_LoadQBSPNodes(const char *name, cplane_t *planes, int numplanes,
mleaf_t *leafs, int numleafs, mnode_t **nodes, int *numnodes, mleaf_t *leafs, int numleafs, mnode_t **nodes, int *numnodes,
const byte *mod_base, const lump_t *l); const byte *mod_base, const lump_t *l, int ident);
extern void Mod_LoadQNodes(const char *name, cplane_t *planes, int numplanes, extern void Mod_LoadQBSPLeafs(const char *name, mleaf_t **leafs, int *numleafs,
mleaf_t *leafs, int numleafs, mnode_t **nodes, int *numnodes, msurface_t **marksurfaces, int nummarksurfaces,
const byte *mod_base, const lump_t *l); const byte *mod_base, const lump_t *l, int ident);
extern void Mod_LoadVertexes(const char *name, mvertex_t **vertexes, int *numvertexes, extern void Mod_LoadVertexes(const char *name, mvertex_t **vertexes, int *numvertexes,
const byte *mod_base, const lump_t *l, int extra); const byte *mod_base, const lump_t *l, int extra);
extern void Mod_LoadVisibility(dvis_t **vis, const byte *mod_base, const lump_t *l); extern void Mod_LoadVisibility(dvis_t **vis, const byte *mod_base, const lump_t *l);
@ -352,9 +352,6 @@ extern void Mod_LoadPlanes(const char *name, cplane_t **planes, int *numplanes,
const byte *mod_base, const lump_t *l, int extra); const byte *mod_base, const lump_t *l, int extra);
extern void Mod_LoadSurfedges(const char *name, int **surfedges, int *numsurfedges, extern void Mod_LoadSurfedges(const char *name, int **surfedges, int *numsurfedges,
const byte *mod_base, const lump_t *l, int extra); const byte *mod_base, const lump_t *l, int extra);
extern void Mod_LoadQBSPLeafs(const char *name, mleaf_t **leafs, int *numleafs,
msurface_t **marksurfaces, int nummarksurfaces,
const byte *mod_base, const lump_t *l, int ident);
extern int Mod_CalcLumpHunkSize(const lump_t *l, int inSize, int outSize, int extra); extern int Mod_CalcLumpHunkSize(const lump_t *l, int inSize, int outSize, int extra);
extern mleaf_t *Mod_PointInLeaf(const vec3_t p, mnode_t *node); extern mleaf_t *Mod_PointInLeaf(const vec3_t p, mnode_t *node);
extern const void *Mod_LoadBSPXFindLump(const bspx_header_t *bspx_header, extern const void *Mod_LoadBSPXFindLump(const bspx_header_t *bspx_header,

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

@ -618,18 +618,9 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen)
Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs, Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs,
mod->marksurfaces, mod->nummarksurfaces, mod_base, mod->marksurfaces, mod->nummarksurfaces, mod_base,
&header->lumps[LUMP_LEAFS], header->ident); &header->lumps[LUMP_LEAFS], header->ident);
if (header->ident == IDBSPHEADER) Mod_LoadQBSPNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
{ mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
Mod_LoadNodes(mod->name, mod->planes, mod->numplanes, mod->leafs, &header->lumps[LUMP_NODES], header->ident);
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
else
{
Mod_LoadQNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]);
mod->numframes = 2; /* regular and alternate animation */ mod->numframes = 2; /* regular and alternate animation */

15
src/client/refresh/vk/vk_model.c
View file

@ -770,18 +770,9 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen)
Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs, Mod_LoadQBSPLeafs(mod->name, &mod->leafs, &mod->numleafs,
mod->marksurfaces, mod->nummarksurfaces, mod_base, mod->marksurfaces, mod->nummarksurfaces, mod_base,
&header->lumps[LUMP_LEAFS], header->ident); &header->lumps[LUMP_LEAFS], header->ident);
if (header->ident == IDBSPHEADER) Mod_LoadQBSPNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
{ mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
Mod_LoadNodes(mod->name, mod->planes, mod->numplanes, mod->leafs, &header->lumps[LUMP_NODES], header->ident);
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
else
{
Mod_LoadQNodes(mod->name, mod->planes, mod->numplanes, mod->leafs,
mod->numleafs, &mod->nodes, &mod->numnodes, mod_base,
&header->lumps[LUMP_NODES]);
}
Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]);
mod->numframes = 2; /* regular and alternate animation */ mod->numframes = 2; /* regular and alternate animation */
} }