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

Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup

This commit is contained in:
Jonathan 2021-10-29 19:49:35 -04:00
parent ceee1a8ecf 69943865e7
commit ea58a6b289
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bsputil/decompile.cpp
View File

@ -386,27 +386,23 @@ static std::vector<decomp_brush_face_t> BuildDecompFacesOnPlane(const mbsp_t *bs
// If we don't specify a node (Q2) automatically discover // If we don't specify a node (Q2) automatically discover
// faces by comparing their plane values. // faces by comparing their plane values.
DecompRecurseNodesLeaves(bsp, &bsp->dnodes[task.model->headnode[0]], [&plane, bsp, &result](auto node, auto front) { for (int i = task.model->firstface; i < task.model->firstface + task.model->numfaces; ++i) {
const mface_t &face = bsp->dfaces[i];
for (auto i = 0; i < node->numfaces; i++) { // Don't ever try pulling textures from nodraw faces (mostly only Q2RTX stuff)
const mface_t &face = bsp->dfaces[node->firstface + i]; if (face.texinfo != -1 && (BSP_GetTexinfo(bsp, face.texinfo)->flags.native & Q2_SURF_NODRAW)) {
continue;
// Don't ever try pulling textures from nodraw faces (mostly only Q2RTX stuff)
if (face.texinfo != -1 && (BSP_GetTexinfo(bsp, face.texinfo)->flags.native & Q2_SURF_NODRAW)) {
continue;
}
qplane3d face_plane = *BSP_GetPlane(bsp, face.planenum);
if (!qv::epsilonEqual(plane, face_plane, DEFAULT_ON_EPSILON) && !qv::epsilonEqual(-plane, face_plane, DEFAULT_ON_EPSILON)) {
continue;
}
result.emplace_back(bsp, &face);
} }
return true; qplane3d face_plane = *BSP_GetPlane(bsp, face.planenum);
}, nullptr);
if (!qv::epsilonEqual(plane, face_plane, DEFAULT_ON_EPSILON) &&
!qv::epsilonEqual(-plane, face_plane, DEFAULT_ON_EPSILON)) {
continue;
}
result.emplace_back(bsp, &face);
}
} }
} else { } else {
const bsp2_dnode_t *node = plane.node; const bsp2_dnode_t *node = plane.node;