diff --git a/ex02/src/main.cpp b/ex02/src/main.cpp index d1807b6..2d8f251 100644 --- a/ex02/src/main.cpp +++ b/ex02/src/main.cpp @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/03/24 15:31:26 by whaffman #+# #+# */ -/* Updated: 2025/03/27 12:25:28 by whaffman ######## odam.nl */ +/* Updated: 2025/04/04 11:32:06 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -31,16 +31,47 @@ int main(void) // std::cout << "c is " << c.toInt() << " as integer" << std::endl; // std::cout << "d is " << d.toInt() << " as integer" << std::endl; - Fixed a; - Fixed const b(Fixed(5.05f) * Fixed(2)); - std::cout << a << std::endl; - std::cout << ++a << std::endl; - std::cout << a << std::endl; - std::cout << a++ << std::endl; - std::cout << a << std::endl; - std::cout << b << std::endl; - std::cout << Fixed(100) / Fixed(8) << std::endl; - std::cout << Fixed::max(a, b) << std::endl; + Fixed a(3.05f); + Fixed b(5.05f); + const Fixed c(2.34f); + const Fixed d(6.235f); + + std::cout << "a: " << a << std::endl; + std::cout << "b: " << b << std::endl; + + std::cout << "a + b: " << a + b << std::endl; + std::cout << "a - b: " << a - b << std::endl; + std::cout << "a * b: " << a * b << std::endl; + std::cout << "a / b: " << a / b << std::endl; + + std::cout << "a++: " << a << std::endl; + std::cout << "++a: " << ++a << std::endl; + std::cout << "a--: " << a << std::endl; + std::cout << "--a: " << --a << std::endl; + + std::cout << "a > b: " << (a > b) << std::endl; + std::cout << "a < b: " << (a < b) << std::endl; + std::cout << "a >= b: " << (a >= b) << std::endl; + std::cout << "a <= b: " << (a <= b) << std::endl; + std::cout << "a == b: " << (a == b) << std::endl; + std::cout << "a != b: " << (a != b) << std::endl; + + std::cout << "min(a, b): " << Fixed::min(a, b) << std::endl; + std::cout << "max(a, b): " << Fixed::max(a, b) << std::endl; + + std::cout << "const" << std::endl; + std::cout << "c: " << c << std::endl; + std::cout << "d: " << d << std::endl; + std::cout << "min(c, d): " << Fixed::min(c, d) << std::endl; + std::cout << "max(c, d): " << Fixed::max(c, d) << std::endl; + std::cout << "min(a, c): " << Fixed::min(a, c) << std::endl; + std::cout << "max(a, c): " << Fixed::max(a, c) << std::endl; + + + std::cout << "c++: " << a << std::endl; + std::cout << "++c: " << ++a << std::endl; + std::cout << "c--: " << a << std::endl; + std::cout << "--c: " << --a << std::endl; return 0; } \ No newline at end of file diff --git a/ex03/src/main.cpp b/ex03/src/main.cpp index 14ce5c4..748c7d9 100644 --- a/ex03/src/main.cpp +++ b/ex03/src/main.cpp @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/03/24 15:31:26 by whaffman #+# #+# */ -/* Updated: 2025/03/27 16:14:32 by whaffman ######## odam.nl */ +/* Updated: 2025/04/04 11:41:46 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -15,16 +15,38 @@ #include "Point.hpp" #include "bsp.h" -int main(void) +void printPoint(const Point &point) { - Point a(0, 0); - Point b(0, 4); - Point c(4, 0); - Point point(2.002f,2.0f); + std::cout << "Point: (" << point.x() << ", " << point.y() << ")" << std::endl; +} +void printTriangle(const Point &a, const Point &b, const Point &c) +{ + std::cout << "Triangle vertices:" << std::endl; + printPoint(a); + printPoint(b); + printPoint(c); +} +void doTriangleCheck(const Point &a, const Point &b, const Point &c, const Point &point) +{ + std::cout << "Checking if point is inside the triangle:" << std::endl; + printTriangle(a, b, c); + printPoint(point); + if (bsp(a, b, c, point)) std::cout << "Point is inside the triangle" << std::endl; else std::cout << "Point is outside the triangle" << std::endl; + std::cout << std::endl; +} + + +int main(void) +{ + doTriangleCheck(Point(0, 0), Point(5, 0), Point(2.5f, 5.0f), Point(2.5f, 2.0f)); + doTriangleCheck(Point(-3, -3), Point(3, -3), Point(0, 3), Point(0, 0)); + doTriangleCheck(Point(1, 1), Point(4, 1), Point(2.5f, 4.0f), Point(2.5f, 2.5f)); + doTriangleCheck(Point(-2, -2), Point(2, -2), Point(0, 2), Point(-1, -1)); + return 0; } \ No newline at end of file