olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: pass hullnum into PortalizeWorld() 

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-02-18 10:32:55 +10:30
parent e943a14944
commit 27252d9104
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qbsp/portals.c
View File

@ -539,7 +539,7 @@ Builds the exact polyhedrons for the nodes and leafs
================== ==================
*/ */
void void
PortalizeWorld(const mapentity_t *ent, node_t *headnode) PortalizeWorld(const mapentity_t *ent, node_t *headnode, const int hullnum)
{ {
Message(msgProgress, "Portalize"); Message(msgProgress, "Portalize");

6
qbsp/qbsp.c
View File

@ -74,7 +74,7 @@ ProcessEntity(mapentity_t *ent)
nodes = SolidBSP(ent, surfs, true); nodes = SolidBSP(ent, surfs, true);
if (ent == pWorldEnt && !options.fNofill) { if (ent == pWorldEnt && !options.fNofill) {
// assume non-world bmodels are simple // assume non-world bmodels are simple
PortalizeWorld(ent, nodes); PortalizeWorld(ent, nodes, hullnum);
if (FillOutside(nodes, hullnum)) { if (FillOutside(nodes, hullnum)) {
// Free portals before regenerating new nodes // Free portals before regenerating new nodes
FreeAllPortals(nodes); FreeAllPortals(nodes);
@ -97,7 +97,7 @@ ProcessEntity(mapentity_t *ent)
// some portals are solid polygons, and some are paths to other leafs // some portals are solid polygons, and some are paths to other leafs
if (ent == pWorldEnt && !options.fNofill) { if (ent == pWorldEnt && !options.fNofill) {
// assume non-world bmodels are simple // assume non-world bmodels are simple
PortalizeWorld(ent, nodes); PortalizeWorld(ent, nodes, hullnum);
if (FillOutside(nodes, hullnum)) { if (FillOutside(nodes, hullnum)) {
FreeAllPortals(nodes); FreeAllPortals(nodes);
@ -112,7 +112,7 @@ ProcessEntity(mapentity_t *ent)
nodes = SolidBSP(ent, surfs, false); nodes = SolidBSP(ent, surfs, false);
// make the real portals for vis tracing // make the real portals for vis tracing
PortalizeWorld(ent, nodes); PortalizeWorld(ent, nodes, hullnum);
TJunc(ent, nodes); TJunc(ent, nodes);
} }

2
qbsp/qbsp.h
View File

@ -639,7 +639,7 @@ void WriteEntitiesToString(void);
void FixRotateOrigin(mapentity_t *ent); void FixRotateOrigin(mapentity_t *ent);
void Brush_LoadEntity(mapentity_t *ent, const int hullnum); void Brush_LoadEntity(mapentity_t *ent, const int hullnum);
surface_t *CSGFaces(const mapentity_t *ent); surface_t *CSGFaces(const mapentity_t *ent);
void PortalizeWorld(const mapentity_t *ent, node_t *headnode); void PortalizeWorld(const mapentity_t *ent, node_t *headnode, const int hullnum);
void TJunc(const mapentity_t *ent, node_t *headnode); void TJunc(const mapentity_t *ent, node_t *headnode);
node_t *SolidBSP(const mapentity_t *ent, surface_t *surfhead, bool midsplit); node_t *SolidBSP(const mapentity_t *ent, surface_t *surfhead, bool midsplit);
void MakeFaceEdges(mapentity_t *ent, node_t *headnode); void MakeFaceEdges(mapentity_t *ent, node_t *headnode);