From 7e16b5d00f54ee03c63e4f4d78f865d8a54fa0ae Mon Sep 17 00:00:00 2001
From: Brandon Lai-Cheong <blaicheo@uwaterloo.ca>
Date: Thu, 21 Nov 2024 23:16:03 -0500
Subject: [PATCH] init point restructure
---
include/point.h | 2 +-
include/triangle.h | 3 +--
src/shapes/point.cpp | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/point.h b/include/point.h
index b29e6be..7b279aa 100644
--- a/include/point.h
+++ b/include/point.h
@@ -2,7 +2,7 @@
#include <ostream>
struct Point {
- float x, y;
+ float x, y, z;
bool operator==(const Point &other) const;
};
diff --git a/include/triangle.h b/include/triangle.h
index 4c7592e..52fd2d8 100644
--- a/include/triangle.h
+++ b/include/triangle.h
@@ -7,12 +7,11 @@
struct Triangle
{
Point points[3];
- int depth;
int id;
std::vector<int> neighbours;
- Triangle(const Point &p1, const Point &p2, const Point &p3, int depth = 0, int id = 0, const std::vector<int> neighbours = {});
+ Triangle(const Point &p1, const Point &p2, const Point &p3, int id = 0, const std::vector<int> neighbours = {});
bool pointInTriangle(const Point &p) const;
Point nextPoint(int pointIndex) const;
bool operator==(const Triangle &other) const;
diff --git a/src/shapes/point.cpp b/src/shapes/point.cpp
index b071f72..ce13d15 100644
--- a/src/shapes/point.cpp
+++ b/src/shapes/point.cpp
@@ -3,9 +3,9 @@
bool Point::operator==(const Point &other) const {
- return (x == other.x) && (y == other.y);
+ return (x == other.x) && (y == other.y) && (z == other.z);
}
std::ostream &operator<<(std::ostream &os, Point const &p) {
- return os << "(" << p.x << "," << p.y << ")";
+ return os << "(" << p.x << "," << p.y << "," << p.z << ")";
}
--
GitLab