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

qv::PolyArea: return 0 for degenerate polygons

This commit is contained in:
Eric Wasylishen 2021-12-15 23:12:48 -07:00
parent d0ea010acb
commit 5c7a490fea
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common/qvec.hh
View File

@ -545,7 +545,8 @@ template<typename Iter, typename T = typename std::iterator_traits<Iter>::value_
template<typename Iter, typename T = typename std::iterator_traits<Iter>::value_type, typename F = typename T::value_type> template<typename Iter, typename T = typename std::iterator_traits<Iter>::value_type, typename F = typename T::value_type>
[[nodiscard]] inline F PolyArea(Iter begin, Iter end) [[nodiscard]] inline F PolyArea(Iter begin, Iter end)
{ {
Q_assert((end - begin) >= 3); if ((end - begin) < 3)
return static_cast<F>(0);
float poly_area = 0; float poly_area = 0;

5
light/test_light.cc
View File

@ -196,6 +196,11 @@ TEST(mathlib, PolygonArea)
{0, 64, 0}, {64, 64, 0}, {64, 0, 0}}; {0, 64, 0}, {64, 64, 0}, {64, 0, 0}};
EXPECT_EQ(64.0f * 64.0f, qv::PolyArea(poly.begin(), poly.end())); EXPECT_EQ(64.0f * 64.0f, qv::PolyArea(poly.begin(), poly.end()));
// 0, 1, or 2 vertices return 0 area
EXPECT_EQ(0.0f, qv::PolyArea(poly.begin(), poly.begin()));
EXPECT_EQ(0.0f, qv::PolyArea(poly.begin(), poly.begin() + 1));
EXPECT_EQ(0.0f, qv::PolyArea(poly.begin(), poly.begin() + 2));
} }
TEST(mathlib, BarycentricFromPoint) TEST(mathlib, BarycentricFromPoint)