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

qbsp: naming fix

This commit is contained in:
Eric Wasylishen 2021-09-06 13:44:36 -06:00
parent dc81db8b2f
commit 648ef89845
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qbsp/map.hh
View File

@ -158,8 +158,8 @@ typedef struct mapdata_s {
// Final, exported data // Final, exported data
std::vector<gtexinfo_t> exported_texinfos; std::vector<gtexinfo_t> exported_texinfos;
std::vector<dplane_t> exported_planes; std::vector<dplane_t> exported_planes;
std::vector<mleaf_t> exported_leafs_bsp29; std::vector<mleaf_t> exported_leafs;
std::vector<bsp2_dnode_t> exported_nodes_bsp29; std::vector<bsp2_dnode_t> exported_nodes;
std::vector<uint32_t> exported_marksurfaces; std::vector<uint32_t> exported_marksurfaces;
std::vector<bsp2_dclipnode_t> exported_clipnodes; std::vector<bsp2_dclipnode_t> exported_clipnodes;
std::vector<bsp2_dedge_t> exported_edges; std::vector<bsp2_dedge_t> exported_edges;

32
qbsp/writebsp.cc
View File

@ -186,8 +186,8 @@ ExportLeaf
static void static void
ExportLeaf(mapentity_t *entity, node_t *node) ExportLeaf(mapentity_t *entity, node_t *node)
{ {
map.exported_leafs_bsp29.push_back({}); map.exported_leafs.push_back({});
mleaf_t *dleaf = &map.exported_leafs_bsp29.back(); mleaf_t *dleaf = &map.exported_leafs.back();
dleaf->contents = RemapContentsForExport(node->contents); dleaf->contents = RemapContentsForExport(node->contents);
AssertVanillaContentType(dleaf->contents); AssertVanillaContentType(dleaf->contents);
@ -236,10 +236,10 @@ ExportDrawNodes(mapentity_t *entity, node_t *node)
bsp2_dnode_t *dnode; bsp2_dnode_t *dnode;
int i; int i;
const size_t ourNodeIndex = map.exported_nodes_bsp29.size(); const size_t ourNodeIndex = map.exported_nodes.size();
map.exported_nodes_bsp29.push_back({}); map.exported_nodes.push_back({});
dnode = &map.exported_nodes_bsp29[ourNodeIndex]; dnode = &map.exported_nodes[ourNodeIndex];
// VectorCopy doesn't work since dest are shorts // VectorCopy doesn't work since dest are shorts
dnode->mins[0] = (short)node->mins[0]; dnode->mins[0] = (short)node->mins[0];
@ -259,19 +259,19 @@ ExportDrawNodes(mapentity_t *entity, node_t *node)
if (node->children[i]->contents == CONTENTS_SOLID) if (node->children[i]->contents == CONTENTS_SOLID)
dnode->children[i] = -1; dnode->children[i] = -1;
else { else {
int nextLeafIndex = static_cast<int>(map.exported_leafs_bsp29.size()); int nextLeafIndex = static_cast<int>(map.exported_leafs.size());
const int childnum = -(nextLeafIndex + 1); const int childnum = -(nextLeafIndex + 1);
dnode->children[i] = childnum; dnode->children[i] = childnum;
ExportLeaf(entity, node->children[i]); ExportLeaf(entity, node->children[i]);
} }
} else { } else {
const int childnum = static_cast<int>(map.exported_nodes_bsp29.size()); const int childnum = static_cast<int>(map.exported_nodes.size());
dnode->children[i] = childnum; dnode->children[i] = childnum;
ExportDrawNodes(entity, node->children[i]); ExportDrawNodes(entity, node->children[i]);
// Important: our dnode pointer may be invalid after the recursive call, if the vector got resized. // Important: our dnode pointer may be invalid after the recursive call, if the vector got resized.
// So re-set the pointer. // So re-set the pointer.
dnode = &map.exported_nodes_bsp29[ourNodeIndex]; dnode = &map.exported_nodes[ourNodeIndex];
} }
} }
@ -296,11 +296,11 @@ ExportDrawNodes(mapentity_t *entity, node_t *headnode, int firstface)
// populate model struct (which was emitted previously) // populate model struct (which was emitted previously)
dmodel = &map.exported_models.at(static_cast<size_t>(entity->outputmodelnumber)); dmodel = &map.exported_models.at(static_cast<size_t>(entity->outputmodelnumber));
dmodel->headnode[0] = static_cast<int>(map.exported_nodes_bsp29.size()); dmodel->headnode[0] = static_cast<int>(map.exported_nodes.size());
dmodel->firstface = firstface; dmodel->firstface = firstface;
dmodel->numfaces = static_cast<int>(map.exported_faces.size()) - firstface; dmodel->numfaces = static_cast<int>(map.exported_faces.size()) - firstface;
const size_t mapleafsAtStart = map.exported_leafs_bsp29.size(); const size_t mapleafsAtStart = map.exported_leafs.size();
{ {
if (headnode->contents < 0) if (headnode->contents < 0)
@ -310,7 +310,7 @@ ExportDrawNodes(mapentity_t *entity, node_t *headnode, int firstface)
} }
// count how many leafs were exported by the above calls // count how many leafs were exported by the above calls
dmodel->visleafs = static_cast<int>(map.exported_leafs_bsp29.size() - mapleafsAtStart); dmodel->visleafs = static_cast<int>(map.exported_leafs.size() - mapleafsAtStart);
/* remove the headnode padding */ /* remove the headnode padding */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -334,9 +334,9 @@ BeginBSPFile(void)
Q_assert(map.exported_edges.size() == 1); Q_assert(map.exported_edges.size() == 1);
// Leave room for leaf 0 (must be solid) // Leave room for leaf 0 (must be solid)
map.exported_leafs_bsp29.push_back({}); map.exported_leafs.push_back({});
map.exported_leafs_bsp29.back().contents = CONTENTS_SOLID; // FIXME-Q2: use Q2_CONTENTS_SOLID map.exported_leafs.back().contents = CONTENTS_SOLID; // FIXME-Q2: use Q2_CONTENTS_SOLID
Q_assert(map.exported_leafs_bsp29.size() == 1); Q_assert(map.exported_leafs.size() == 1);
} }
/* /*
@ -424,9 +424,9 @@ WriteBSPFile()
bspdata.version = &bspver_generic; bspdata.version = &bspver_generic;
CopyVector(map.exported_planes, &bspdata.data.mbsp.numplanes, &bspdata.data.mbsp.dplanes); CopyVector(map.exported_planes, &bspdata.data.mbsp.numplanes, &bspdata.data.mbsp.dplanes);
CopyVector(map.exported_leafs_bsp29, &bspdata.data.mbsp.numleafs, &bspdata.data.mbsp.dleafs); CopyVector(map.exported_leafs, &bspdata.data.mbsp.numleafs, &bspdata.data.mbsp.dleafs);
CopyVector(map.exported_vertexes, &bspdata.data.mbsp.numvertexes, &bspdata.data.mbsp.dvertexes); CopyVector(map.exported_vertexes, &bspdata.data.mbsp.numvertexes, &bspdata.data.mbsp.dvertexes);
CopyVector(map.exported_nodes_bsp29, &bspdata.data.mbsp.numnodes, &bspdata.data.mbsp.dnodes); CopyVector(map.exported_nodes, &bspdata.data.mbsp.numnodes, &bspdata.data.mbsp.dnodes);
CopyVector(map.exported_texinfos, &bspdata.data.mbsp.numtexinfo, &bspdata.data.mbsp.texinfo); CopyVector(map.exported_texinfos, &bspdata.data.mbsp.numtexinfo, &bspdata.data.mbsp.texinfo);
CopyVector(map.exported_faces, &bspdata.data.mbsp.numfaces, &bspdata.data.mbsp.dfaces); CopyVector(map.exported_faces, &bspdata.data.mbsp.numfaces, &bspdata.data.mbsp.dfaces);
CopyVector(map.exported_clipnodes, &bspdata.data.mbsp.numclipnodes, &bspdata.data.mbsp.dclipnodes); CopyVector(map.exported_clipnodes, &bspdata.data.mbsp.numclipnodes, &bspdata.data.mbsp.dclipnodes);