qbsp: merge from master
This commit is contained in:
commit
b1892d6aa3
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cfloat>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
@ -196,12 +197,10 @@ ExportLeaf(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] = floor(node->mins[i]);
|
||||||
dleaf->mins[2] = (short)node->mins[2];
|
dleaf->maxs[i] = 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
|
||||||
|
|
||||||
|
|
@ -242,12 +241,10 @@ ExportDrawNodes(mapentity_t *entity, node_t *node)
|
||||||
dnode = &map.exported_nodes[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];
|
for (int i = 0; i < 3; ++i) {
|
||||||
dnode->mins[1] = (short)node->mins[1];
|
dnode->mins[i] = floor(node->mins[i]);
|
||||||
dnode->mins[2] = (short)node->mins[2];
|
dnode->maxs[i] = 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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue