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

fix the Q1 bevel code for testing later

This commit is contained in:
Jonathan 2022-08-20 08:19:46 -04:00
parent 39bbd643d5
commit bfe56b0663
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qbsp/brush.cc
View File

@ -309,8 +309,6 @@ AddBrushPlane
*/
static bool AddBrushPlane(hullbrush_t &hullbrush, const qbsp_plane_t &plane)
{
vec_t len = qv::length(plane.get_normal());
for (auto &s : hullbrush.brush.sides) {
if (qv::epsilonEqual(s.get_plane(), plane)) {
return false;
@ -461,8 +459,6 @@ ExpandBrush
*/
static void ExpandBrush(hullbrush_t &hullbrush, const aabb3d &hull_size)
{
size_t total_original_sides = hullbrush.brush.sides.size();
// create all the hull points
for (auto &f : hullbrush.brush.sides) {
for (auto &pt : f.w) {
@ -600,7 +596,7 @@ std::optional<bspbrush_t> LoadBrush(const mapentity_t &src, mapbrush_t &mapbrush
}
#else
if (!CreateBrushWindings(brush, mapbrush.is_hint)) {
if (!CreateBrushWindings(brush)) {
return std::nullopt;
}

4
qbsp/map.cc
View File

@ -1837,9 +1837,7 @@ static bool AddBrushPlane(map_hullbrush_t &hullbrush, const qbsp_plane_t &plane,
// fixme: why did we need to store all this stuff again, isn't
// it in texinfo?
s.raw_info = hullbrush.brush.faces[0].raw_info;
s.flags = hullbrush.brush.faces[0].flags;
s.texname = hullbrush.brush.faces[0].texname;
s.value = hullbrush.brush.faces[0].value;
s.bevel = true;
return true;
}
@ -1991,8 +1989,6 @@ ExpandBrush
*/
static void ExpandBrush(map_hullbrush_t &hullbrush, const aabb3d &hull_size)
{
size_t total_original_sides = hullbrush.brush.faces.size();
// create all the hull points
for (auto &f : hullbrush.brush.faces) {
for (auto &pt : f.winding) {