From b227700f77ed0e14c0caaf88230d3184a04b35d3 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:36:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E4=B8=80Submesh=E7=B5=90=E5=90=88?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同上 --- src/polygon_mesh/sub_mesh.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/polygon_mesh/sub_mesh.cpp b/src/polygon_mesh/sub_mesh.cpp index 20ec39be..98960d60 100644 --- a/src/polygon_mesh/sub_mesh.cpp +++ b/src/polygon_mesh/sub_mesh.cpp @@ -89,16 +89,15 @@ namespace plateau::polygonMesh { bool compareTVec3f(const TVec3f& l, const TVec3f& r) { // lがrより小さいときにtrueを返します。 constexpr float epsilon = 0.0001f; - if(std::abs(l.x - l.y) > epsilon) return l.x < r.x; - if(std::abs(l.y - l.y) > epsilon) return l.y < r.y; - if(std::abs(l.z - l.z) > epsilon) return l.z < r.z; - return false; // areEqualTVec3f() がtrueを返すときにこの行が実行されるようにします。 + if(std::abs(l.x - r.x) > epsilon) return l.x < r.x; + if(std::abs(l.y - r.y) > epsilon) return l.y < r.y; + if(std::abs(l.z - r.z) > epsilon) return l.z < r.z; + return false; } bool areEqualTVec3f(const TVec3f& l, const TVec3f& r) { - // compareTVec3f() の最後の行のreturn falseが実行されるケースを記述します。 - constexpr float epsilon = 0.0001f; - return std::abs(l.x - r.x) <= epsilon && std::abs(l.y - r.y) <= epsilon && std::abs(l.z - r.z) <= epsilon; + + return compareTVec3f(l, r) == false && compareTVec3f(r, l) == false; } } From 894f3ad93c2935a3491c7df503f61cbb29826083 Mon Sep 17 00:00:00 2001 From: Linoal <1321932+linoal@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:51:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?ThirdPartyNotices.md=E3=81=AE=E6=9B=B8?= =?UTF-8?q?=E5=BC=8F=E3=81=8C=E4=B8=80=E9=83=A8=E5=B4=A9=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ThirdPartyNotices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdPartyNotices.md b/ThirdPartyNotices.md index abea1c96..110488df 100644 --- a/ThirdPartyNotices.md +++ b/ThirdPartyNotices.md @@ -806,7 +806,7 @@ SOFTWARE. ## glm **Source:** [https://github.com/g-truc/glm](https://github.com/g-truc/glm) ### License -``================================================================================ +```================================================================================ OpenGL Mathematics (GLM) -------------------------------------------------------------------------------- GLM is licensed under The Happy Bunny License or MIT License