godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct how filterIntersections work, seems c++ don't like how thing were done.

Browse Source
This commit is contained in:
Godzil
2020-03-09 13:44:10 +00:00
parent cd93b67274
commit 8550d4068f
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/include/csg.h
View File

@@ -34,7 +34,7 @@ protected:
bool intersectionAllowed(bool leftHit, bool inLeft, bool inRight);
Intersect filterIntersections(Intersect &xs);
void filterIntersections(Intersect &xs, Intersect &ret);
void updateBoundingBox();
BoundingBox getBounds();

6
source/shapes/csg.cpp
View File

@@ -101,13 +101,11 @@ bool CSG::intersectionAllowed(bool leftHit, bool inLeft, bool inRight)
return false;
}
Intersect CSG::filterIntersections(Intersect &xs)
void CSG::filterIntersections(Intersect &xs, Intersect &ret)
{
bool inl = false;
bool inr = false;
Intersect ret = Intersect();
int i;
for(i = 0; i < xs.count(); i++)
@@ -128,8 +126,6 @@ Intersect CSG::filterIntersections(Intersect &xs)
inr = !inr;
}
}
return ret;
}
void CSG::dumpMe(FILE *fp)