From 306c749ce7d9a9756a4b08c62549d34830d4721b Mon Sep 17 00:00:00 2001
From: Brandon Lai-Cheong <brandon.lai-cheong@uwaterloo.ca>
Date: Fri, 1 Nov 2024 16:09:51 -0400
Subject: [PATCH] updates to triangle
---
src/shapes/triangle.cpp | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/shapes/triangle.cpp b/src/shapes/triangle.cpp
index c07c9a4..a73f014 100644
--- a/src/shapes/triangle.cpp
+++ b/src/shapes/triangle.cpp
@@ -12,7 +12,15 @@ bool Triangle::pointInTriangle(const Point &p) const {
// all tests must be positive
auto edges = TriangleEdges(*this);
- return !edges.e1.positiveSide(p) &&
- !edges.e2.positiveSide(p) &&
- !edges.e3.positiveSide(p);
+ for (int i = 0; i < NB_TRIANGLE_SIDES; i++) {
+ if (edges.edges[i].positiveSide(p)) {
+ return false;
+ }
+ }
+ return true;
+}
+
+
+int nextPoint(int pointIndex) {
+ return (pointIndex + 1) % 3;
}
\ No newline at end of file
--
GitLab