quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for loading broken maps written by ZeroRadiant that have a duplicate plane

Browse Source
This commit is contained in:
Rudolf Polzer 2010-12-02 14:31:53 +01:00
parent 27ecd5cda3
commit 6d09dee422
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radiant/brush.h
View File

@ -1542,10 +1542,13 @@ void add_brush_filter(BrushFilter& filter, int mask, bool invert = false);
/// \brief Returns true if 'self' takes priority when building brush b-rep. /// \brief Returns true if 'self' takes priority when building brush b-rep.
inline bool plane3_inside(const Plane3& self, const Plane3& other) inline bool plane3_inside(const Plane3& self, const Plane3& other, bool selfIsLater)
{ {
if(vector3_equal_epsilon(self.normal(), other.normal(), 0.001)) if(vector3_equal_epsilon(self.normal(), other.normal(), 0.001))
{ {
// same plane? prefer the one with smaller index
if(self.dist() == other.dist())
return selfIsLater;
return self.dist() < other.dist(); return self.dist() < other.dist();
} }
return true; return true;
@ -2420,7 +2423,7 @@ private:
// duplicate plane // duplicate plane
for(std::size_t i = 0; i < m_faces.size(); ++i) for(std::size_t i = 0; i < m_faces.size(); ++i)
{ {
if(index != i && !plane3_inside(m_faces[index]->plane3(), m_faces[i]->plane3())) if(index != i && !plane3_inside(m_faces[index]->plane3(), m_faces[i]->plane3(), index < i))
{ {
return false; return false;
} }