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

qbsp: fix node/leaf mins/maxs calculations 

they should use floor/ceil.

Otherwise a node with max X=10.5 will be written
to bsp29 as having a max of 10
This commit is contained in:
Eric Wasylishen 2021-09-06 12:03:59 -06:00
parent 90973e1198
commit d85ca375e5
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
qbsp/writebsp.cc
View File

@ -25,6 +25,7 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <cfloat>
#include <cstdint> #include <cstdint>
static void static void
@ -364,12 +365,10 @@ ExportLeaf_BSP29(mapentity_t *entity, node_t *node)
* write bounding box info * write bounding box info
* (VectorCopy doesn't work since dest are shorts) * (VectorCopy doesn't work since dest are shorts)
*/ */
dleaf->mins[0] = (short)node->mins[0]; for (int i = 0; i < 3; ++i) {
dleaf->mins[1] = (short)node->mins[1]; dleaf->mins[i] = (short)floor(node->mins[i]);
dleaf->mins[2] = (short)node->mins[2]; dleaf->maxs[i] = (short)ceil(node->maxs[i]);
dleaf->maxs[0] = (short)node->maxs[0]; }
dleaf->maxs[1] = (short)node->maxs[1];
dleaf->maxs[2] = (short)node->maxs[2];
dleaf->visofs = -1; // no vis info yet dleaf->visofs = -1; // no vis info yet
@ -414,12 +413,10 @@ ExportLeaf_BSP2(mapentity_t *entity, node_t *node)
* write bounding box info * write bounding box info
* (VectorCopy doesn't work double->float) * (VectorCopy doesn't work double->float)
*/ */
dleaf->mins[0] = node->mins[0]; for (int i = 0; i < 3; ++i) {
dleaf->mins[1] = node->mins[1]; dleaf->mins[i] = node->mins[i];
dleaf->mins[2] = node->mins[2]; dleaf->maxs[i] = node->maxs[i];
dleaf->maxs[0] = node->maxs[0]; }
dleaf->maxs[1] = node->maxs[1];
dleaf->maxs[2] = node->maxs[2];
dleaf->visofs = -1; // no vis info yet dleaf->visofs = -1; // no vis info yet
@ -464,12 +461,10 @@ ExportLeaf_BSP2rmq(mapentity_t *entity, node_t *node)
* write bounding box info * write bounding box info
* (VectorCopy doesn't work since dest are shorts) * (VectorCopy doesn't work since dest are shorts)
*/ */
dleaf->mins[0] = (short)node->mins[0]; for (int i = 0; i < 3; ++i) {
dleaf->mins[1] = (short)node->mins[1]; dleaf->mins[i] = (short)floor(node->mins[i]);
dleaf->mins[2] = (short)node->mins[2]; dleaf->maxs[i] = (short)ceil(node->maxs[i]);
dleaf->maxs[0] = (short)node->maxs[0]; }
dleaf->maxs[1] = (short)node->maxs[1];
dleaf->maxs[2] = (short)node->maxs[2];
dleaf->visofs = -1; // no vis info yet dleaf->visofs = -1; // no vis info yet
@ -510,12 +505,10 @@ ExportDrawNodes_BSP29(mapentity_t *entity, node_t *node)
map.cTotal[LUMP_NODES]++; map.cTotal[LUMP_NODES]++;
// VectorCopy doesn't work since dest are shorts // VectorCopy doesn't work since dest are shorts
dnode->mins[0] = (short)node->mins[0]; for (int i = 0; i < 3; ++i) {
dnode->mins[1] = (short)node->mins[1]; dnode->mins[i] = (short)floor(node->mins[i]);
dnode->mins[2] = (short)node->mins[2]; dnode->maxs[i] = (short)ceil(node->maxs[i]);
dnode->maxs[0] = (short)node->maxs[0]; }
dnode->maxs[1] = (short)node->maxs[1];
dnode->maxs[2] = (short)node->maxs[2];
dnode->planenum = ExportMapPlane(node->planenum); dnode->planenum = ExportMapPlane(node->planenum);
dnode->firstface = node->firstface; dnode->firstface = node->firstface;
@ -564,12 +557,10 @@ ExportDrawNodes_BSP2(mapentity_t *entity, node_t *node)
map.cTotal[LUMP_NODES]++; map.cTotal[LUMP_NODES]++;
// VectorCopy doesn't work double->float // VectorCopy doesn't work double->float
dnode->mins[0] = node->mins[0]; for (int i = 0; i < 3; ++i) {
dnode->mins[1] = node->mins[1]; dnode->mins[i] = node->mins[i];
dnode->mins[2] = node->mins[2]; dnode->maxs[i] = node->maxs[i];
dnode->maxs[0] = node->maxs[0]; }
dnode->maxs[1] = node->maxs[1];
dnode->maxs[2] = node->maxs[2];
dnode->planenum = ExportMapPlane(node->planenum); dnode->planenum = ExportMapPlane(node->planenum);
dnode->firstface = node->firstface; dnode->firstface = node->firstface;
@ -606,12 +597,10 @@ ExportDrawNodes_BSP2rmq(mapentity_t *entity, node_t *node)
map.cTotal[LUMP_NODES]++; map.cTotal[LUMP_NODES]++;
// VectorCopy doesn't work since dest are shorts // VectorCopy doesn't work since dest are shorts
dnode->mins[0] = node->mins[0]; for (int i = 0; i < 3; ++i) {
dnode->mins[1] = node->mins[1]; dnode->mins[i] = (short)floor(node->mins[i]);
dnode->mins[2] = node->mins[2]; dnode->maxs[i] = (short)ceil(node->maxs[i]);
dnode->maxs[0] = node->maxs[0]; }
dnode->maxs[1] = node->maxs[1];
dnode->maxs[2] = node->maxs[2];
dnode->planenum = ExportMapPlane(node->planenum); dnode->planenum = ExportMapPlane(node->planenum);
dnode->firstface = node->firstface; dnode->firstface = node->firstface;