commit 149dce9495210c9134fbc26d46f7128c14fd7f44 Author: Tyler Beckman Date: Wed Nov 6 17:02:59 2024 -0700 Initial commit diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..f003663 --- /dev/null +++ b/.clang-format @@ -0,0 +1,43 @@ +# Tyler's personal code-style formatting file, make sure to use the class version before turning in +IndentWidth: 4 +UseTab: Always +TabWidth: 4 +InsertBraces: false +SortIncludes: true +IncludeBlocks: Regroup +IncludeCategories: + # System headers from C (hardcoded, it isn't really possible to automatically detect them with regex) + - Regex: '' + Priority: 3 + # System headers without extension. + - Regex: '<([A-Za-z0-9\Q/-_\E])+>' + Priority: 2 + # Local headers with extension. + - Regex: '"([A-Za-z0-9\Q/-_\E])+\.h(pp)?"' + Priority: 1 +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + SplitEmptyFunction: false + SplitEmptyRecord: false + SplitEmptyNamespace: false +IndentCaseLabels: true +IntegerLiteralSeparator: + Binary: 0 + Decimal: 3 + Hex: -1 +DerivePointerAlignment: false +PointerAlignment: Right +QualifierAlignment: Left \ No newline at end of file diff --git a/.class-clang-format b/.class-clang-format new file mode 100644 index 0000000..2703ca6 --- /dev/null +++ b/.class-clang-format @@ -0,0 +1,43 @@ +# A clang-format config to follow CSCI200's style guide, use before turning in +IndentWidth: 2 +UseTab: Never +TabWidth: 2 +InsertBraces: true +SortIncludes: true +IncludeBlocks: Regroup +IncludeCategories: + # System headers from C + - Regex: '' + Priority: 3 + # System headers without extension. + - Regex: '<([A-Za-z0-9\Q/-_\E])+>' + Priority: 2 + # Local headers with extension. + - Regex: '"([A-Za-z0-9\Q/-_\E])+\.h(pp)?"' + Priority: 1 +BraceWrapping: + AfterCaseLabel: false + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + SplitEmptyFunction: false + SplitEmptyRecord: false + SplitEmptyNamespace: false +IndentCaseLabels: true +IntegerLiteralSeparator: + Binary: -1 + Decimal: -1 + Hex: -1 +DerivePointerAlignment: false +PointerAlignment: Left +QualifierAlignment: Left \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8591ed0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +# Packed files +./*.tar.gz +# Built object files +./**/*.o \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..15de28b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Launch", + "type": "lldb", + "request": "launch", + "program": "${workspaceFolder}/${workspaceFolderBasename}", + "args": [], + "preLaunchTask": "make", + "console": "integratedTerminal", + "sourceLanguages": ["cpp"] + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..1803238 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,12 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "make", + "type": "shell", + "command": "make" + } + ] +} \ No newline at end of file diff --git a/Coordinate.cpp b/Coordinate.cpp new file mode 100644 index 0000000..0c65c92 --- /dev/null +++ b/Coordinate.cpp @@ -0,0 +1,11 @@ +#include "Coordinate.h" + +Coordinate::Coordinate() { + x = 0; + y = 0; +} + +Coordinate::Coordinate(const double X, const double Y) { + x = X; + y = Y; +} \ No newline at end of file diff --git a/Coordinate.h b/Coordinate.h new file mode 100644 index 0000000..278c4dc --- /dev/null +++ b/Coordinate.h @@ -0,0 +1,12 @@ +#ifndef COORDINATE_H +#define COORDINATE_H +class Coordinate { + public: + Coordinate(); + Coordinate(const double X, const double Y); + + double x; + double y; +}; + +#endif // COORDINATE_H diff --git a/EquilateralTriangle.cpp b/EquilateralTriangle.cpp new file mode 100644 index 0000000..c77340f --- /dev/null +++ b/EquilateralTriangle.cpp @@ -0,0 +1,12 @@ +#include "EquilateralTriangle.h" +#include "GeometryUtils.h" + +bool EquilateralTriangle::validate() { + double sideOne = calculate_distance(mVertices[0], mVertices[1]); + double sideTwo = calculate_distance(mVertices[1], mVertices[2]); + double sideThree = calculate_distance(mVertices[2], mVertices[0]); + + // Equilateral triangles must (a) Be a triangle and (b) Have three equal sides + return lengths_make_triangle(sideOne, sideTwo, sideThree) + && (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree)); +} \ No newline at end of file diff --git a/EquilateralTriangle.h b/EquilateralTriangle.h new file mode 100644 index 0000000..ae4820c --- /dev/null +++ b/EquilateralTriangle.h @@ -0,0 +1,9 @@ +#ifndef EQUILATERAL_TRIANGLE_H +#define EQUILATERAL_TRIANGLE_H +#include "Triangle.h" +class EquilateralTriangle : public ATriangle { + public: + bool validate() override; +}; + +#endif // EQUILATERAL_TRIANGLE_H diff --git a/GeometryUtils.cpp b/GeometryUtils.cpp new file mode 100644 index 0000000..868f89a --- /dev/null +++ b/GeometryUtils.cpp @@ -0,0 +1,34 @@ +#include + +#include "GeometryUtils.h" + +const double EPSILON = std::numeric_limits::epsilon(); + +bool double_eq(double first, double second) { + if (std::abs(first - second) <= EPSILON) { + return true; + } else { + return false; + } +} + +double calculate_distance(Coordinate& firstPoint, Coordinate& secondPoint) { + return std::sqrt( + std::pow(secondPoint.x - firstPoint.x, 2) + + std::pow(secondPoint.y - firstPoint.y, 2) + ); +} + +bool lengths_make_triangle(double sideOne, double sideTwo, double sideThree) { + // Not a triangle if one of the side lengths is 0 + if (sideOne <= EPSILON || sideTwo <= EPSILON || sideThree <= EPSILON) { + return false; + } + + // Not a triangle if the sum of any two side lengths >= the third length + if (sideOne + sideTwo <= sideThree || sideTwo + sideThree <= sideOne || sideThree + sideOne <= sideTwo) { + return false; + } + + return true; +} \ No newline at end of file diff --git a/GeometryUtils.h b/GeometryUtils.h new file mode 100644 index 0000000..e0c93e7 --- /dev/null +++ b/GeometryUtils.h @@ -0,0 +1,37 @@ +#ifndef GEOMETRY_UTILS_H +#define GEOMETRY_UTILS_H +#include "Coordinate.h" +#include + +/** + * @brief Compares two doubles to see if they are equal, within the system epsilon range + * + * @param first The first value to compare + * @param second The second value to compare + * @return true The values are equal + * @return false The values are not equal + */ +bool double_eq(double first, double second); + +/** + * @brief Calculates the distance between two coordinate points + * + * @param firstPoint The first coordinate point to calculate the distance of + * @param secondPoint The second coordinate point to compare the first to + * @return double The pythagorean distance between the two points + */ +double calculate_distance(Coordinate& firstPoint, Coordinate& secondPoint); + +/** + * @brief Returns true if all of the side lengths in the specified array make a triangle + * + * @param sideOne The first side to check for "triangle-ness" + * @param sideTwo The second side to check for "triangle-ness" + * @param sideThree The third side to check for "triangle-ness" + * + * @return true The side lengths do make a geometrically sound triangle + * @return false The side lengths do not make a geometrically sound triangle + */ +bool lengths_make_triangle(double sideOne, double sideTwo, double sideThree); + +#endif // GEOMETRY_UTILS_H diff --git a/IsoscelesTriangle.cpp b/IsoscelesTriangle.cpp new file mode 100644 index 0000000..e3bebf5 --- /dev/null +++ b/IsoscelesTriangle.cpp @@ -0,0 +1,12 @@ +#include "IsoscelesTriangle.h" +#include "GeometryUtils.h" + +bool IsoscelesTriangle::validate() { + double sideOne = calculate_distance(mVertices[0], mVertices[1]); + double sideTwo = calculate_distance(mVertices[1], mVertices[2]); + double sideThree = calculate_distance(mVertices[2], mVertices[0]); + + // Isosceles triangles must (a) Be a triangle and (b) Have two sides that equal each other + return lengths_make_triangle(sideOne, sideTwo, sideThree) + && (double_eq(sideOne, sideTwo) || double_eq(sideTwo, sideThree) || double_eq(sideThree, sideOne)); +} \ No newline at end of file diff --git a/IsoscelesTriangle.h b/IsoscelesTriangle.h new file mode 100644 index 0000000..3467a2c --- /dev/null +++ b/IsoscelesTriangle.h @@ -0,0 +1,9 @@ +#ifndef ISOSCELES_TRIANGLE_H +#define ISOSCELES_TRIANGLE_H +#include "Triangle.h" +class IsoscelesTriangle : public ATriangle { + public: + bool validate() override; +}; + +#endif // ISOSCELES_TRIANGLE_H diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..36dc8db --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,41 @@ +# Creative Commons CC0 1.0 Universal + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER. + +## Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. + +1. __Copyright and Related Rights.__ A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. + +2. __Waiver.__ To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. + +3. __Public License Fallback.__ Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. + +4. __Limitations and Disclaimers.__ + + a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ca84894 --- /dev/null +++ b/Makefile @@ -0,0 +1,119 @@ +TARGET = A5 +SRC_FILES = main.cpp Coordinate.cpp Triangle.cpp Polygon.cpp ScaleneTriangle.cpp GeometryUtils.cpp IsoscelesTriangle.cpp EquilateralTriangle.cpp Quadrilateral.cpp Rhombus.cpp + +# Tyler's custom makefile extensions for CSCI200 (anyone can use these if they want) +.DEFAULT_GOAL := all # Necessary so `make` doesn't run the "pack" target, as it is declared before "all" +.PHONY: pack clean-run c run fmt + +## Adds only the necessary files for build into a .tar.gz file, named appropriately +ARCHIVED_FILES = Makefile $(SRC_FILES) $(SRC_FILES:.cpp=.h) $(SRC_FILES:.cpp=.hpp) +pack: fmtc + tar --ignore-failed-read -czvf $(TARGET).tar.gz $(shell echo $(ARCHIVED_FILES) | xargs ls -d 2>/dev/null) + +## Runs the pack target and then attempts to build & run the program to make sure it functions correctly +pack-test: pack + $(eval TMP := $(shell mktemp -d)) + tar -xvzf $(TARGET).tar.gz --directory $(TMP) + make -C $(TMP) + $(TMP)/$(TARGET) + rm -rf $(TMP) + +## An extension of the clean command that is shorter to type and removes a potential .tar.gz file +c: clean + $(DEL) -f $(TARGET).tar.gz Makefile.bak + +## Simply builds and then executes the program +run: all + ./$(TARGET) + +## Formats all cpp, h, and hpp files with clang-format, using my personal clang-format config +fmt: + find . -iname '*.hpp' -o -iname '*.h' -o -iname '*.cpp' | xargs clang-format --style=file:.clang-format -i + +## Formats all cpp, h, and hpp files with clang-format, using the class clang-format config +fmtc: + find . -iname '*.hpp' -o -iname '*.h' -o -iname '*.cpp' | xargs clang-format --style=file:.class-clang-format -i + +## Modifies the SRC_FILES variable to have all .cpp files in the repo +setupsrc: + sed -i "0,/SRC_FILE.\{0\}S = .*/ s//SRC_FILES = $(shell find . -iname '*.cpp' -printf '%P\n')/" Makefile + +## Alias to setup SRC_FILES and then dependencies +setup: setupsrc depend + +# NO EDITS NEEDED BELOW THIS LINE + +CXX = g++ +CXXFLAGS = -O2 +CXXFLAGS_DEBUG = -g +CXXFLAGS_WARN = -Wall -Wextra -Wunreachable-code -Wshadow -Wpedantic +CPPVERSION = -std=c++17 + +OBJECTS = $(SRC_FILES:.cpp=.o) + +ifeq ($(OS),Windows_NT) + TARGET := $(TARGET).exe + DEL = del + Q = + + INC_PATH = Z:/CSCI200/include/ + LIB_PATH = Z:/CSCI200/lib/ + + RPATH = +else + DEL = rm -f + Q = " + + INC_PATH = /usr/local/include/ + LIB_PATH = /usr/local/lib/ + + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Linux) + CXXFLAGS += -D LINUX + RPATH = + endif + ifeq ($(UNAME_S),Darwin) + CXXFLAGS += -D OSX + RPATH = -Wl,-rpath,/Library/Frameworks + endif + + UNAME_P := $(shell uname -p) +endif + +LIBS = -lsfml-graphics -lsfml-window -lsfml-system -lsfml-audio -lsfml-network + +all: $(TARGET) + +$(TARGET): $(OBJECTS) + $(CXX) -o $@ $^ $(RPATH) -L$(LIB_PATH) $(LIBS) + +.cpp.o: + $(CXX) $(CXXFLAGS) $(CPPVERSION) $(CXXFLAGS_DEBUG) $(CXXFLAGS_WARN) -o $@ -c $< -I$(INC_PATH) + +clean: + $(DEL) $(TARGET) $(OBJECTS) + +depend: + @sed -i.bak '/^# DEPENDENCIES/,$$d' Makefile + @$(DEL) sed* + @echo $(Q)# DEPENDENCIES$(Q) >> Makefile + @$(CXX) -MM $(SRC_FILES) >> Makefile + +.PHONY: all clean depend + +# DEPENDENCIES +main.o: main.cpp Coordinate.h EquilateralTriangle.h Triangle.h Polygon.h \ + IsoscelesTriangle.h Rhombus.h Quadrilateral.h ScaleneTriangle.h +Coordinate.o: Coordinate.cpp Coordinate.h +Triangle.o: Triangle.cpp Triangle.h Polygon.h Coordinate.h +Polygon.o: Polygon.cpp Coordinate.h Polygon.h +ScaleneTriangle.o: ScaleneTriangle.cpp ScaleneTriangle.h Triangle.h \ + Polygon.h Coordinate.h GeometryUtils.h +GeometryUtils.o: GeometryUtils.cpp GeometryUtils.h Coordinate.h +IsoscelesTriangle.o: IsoscelesTriangle.cpp IsoscelesTriangle.h Triangle.h \ + Polygon.h Coordinate.h GeometryUtils.h +EquilateralTriangle.o: EquilateralTriangle.cpp EquilateralTriangle.h \ + Triangle.h Polygon.h Coordinate.h GeometryUtils.h +Quadrilateral.o: Quadrilateral.cpp Quadrilateral.h Polygon.h Coordinate.h +Rhombus.o: Rhombus.cpp Rhombus.h Quadrilateral.h Polygon.h Coordinate.h \ + GeometryUtils.h IsoscelesTriangle.h Triangle.h diff --git a/Polygon.cpp b/Polygon.cpp new file mode 100644 index 0000000..51a7616 --- /dev/null +++ b/Polygon.cpp @@ -0,0 +1,33 @@ +#include +#include + +#include "Coordinate.h" +#include "Polygon.h" + +APolygon::APolygon() { + _color = sf::Color::White; + mNumVertices = 0; + mVertices = nullptr; +} + +APolygon::~APolygon() { + delete[] mVertices; +} + +void APolygon::setColor(const sf::Color COLOR) { + _color = COLOR; +} + +void APolygon::draw(sf::RenderTarget& window) { + sf::ConvexShape shape(mNumVertices); + for (int i = 0; i < mNumVertices; i++) { + shape.setPoint(i, sf::Vector2f(mVertices[i].x, mVertices[i].y)); + } + shape.setFillColor(_color); + + window.draw(shape); +} + +void APolygon::setCoordinate(const int IDX, const Coordinate COORD) { + mVertices[IDX] = COORD; +} diff --git a/Polygon.h b/Polygon.h new file mode 100644 index 0000000..d5be762 --- /dev/null +++ b/Polygon.h @@ -0,0 +1,51 @@ +#ifndef POLYGON_H +#define POLYGON_H +#include + +#include "Coordinate.h" + +class APolygon { + public: + /** + * @brief Construct a new Polygon object, with a white color and 0 vertices + */ + APolygon(); + /** + * @brief Destroy the APolygon object + */ + virtual ~APolygon(); + + /** + * @brief Sets the color of this polygon + * + * @param COLOR The color to change the polygon to + */ + void setColor(const sf::Color COLOR); + /** + * @brief Draws this polygon to a SFML render target + * + * @param window The render target to draw the polygon on + */ + void draw(sf::RenderTarget& window); + /** + * @brief Sets the coordinate point at a specific vertex of this polygon + * + * @param IDX The index of the vertex to change + * @param COORD The coordinate location to set the vertex to + */ + void setCoordinate(const int IDX, const Coordinate COORD); + /** + * @brief Returns if the created polygon is valid or not + * + * @return true All of the vertices of the polygon line up with the current polygon type + * @return false The vertices are invalid for the current polygon type + */ + virtual bool validate() = 0; + protected: + short mNumVertices; + Coordinate* mVertices; + private: + sf::Color _color; +}; + +#endif // POLYGON_H diff --git a/Quadrilateral.cpp b/Quadrilateral.cpp new file mode 100644 index 0000000..d4e2aaa --- /dev/null +++ b/Quadrilateral.cpp @@ -0,0 +1,7 @@ +#include "Quadrilateral.h" +#include "Coordinate.h" + +AQuadrilateral::AQuadrilateral() { + mNumVertices = 4; + mVertices = new Coordinate[4]; +} \ No newline at end of file diff --git a/Quadrilateral.h b/Quadrilateral.h new file mode 100644 index 0000000..c7f2eeb --- /dev/null +++ b/Quadrilateral.h @@ -0,0 +1,9 @@ +#ifndef QUADRILATERAL_H +#define QUADRILATERAL_H +#include "Polygon.h" +class AQuadrilateral : public APolygon { + public: + AQuadrilateral(); +}; + +#endif // QUADRILATERAL_H diff --git a/Rhombus.cpp b/Rhombus.cpp new file mode 100644 index 0000000..fef4399 --- /dev/null +++ b/Rhombus.cpp @@ -0,0 +1,26 @@ +#include "Rhombus.h" +#include "GeometryUtils.h" +#include "IsoscelesTriangle.h" + +bool Rhombus::validate() { + double sideOne = calculate_distance(mVertices[0], mVertices[1]); + double sideTwo = calculate_distance(mVertices[1], mVertices[2]); + double sideThree = calculate_distance(mVertices[2], mVertices[3]); + double sideFour = calculate_distance(mVertices[3], mVertices[0]); + + IsoscelesTriangle firstTriangle; + firstTriangle.setCoordinate(0, mVertices[0]); + firstTriangle.setCoordinate(1, mVertices[1]); + firstTriangle.setCoordinate(2, mVertices[2]); + + IsoscelesTriangle secondTriangle; + secondTriangle.setCoordinate(0, mVertices[0]); + secondTriangle.setCoordinate(1, mVertices[2]); + secondTriangle.setCoordinate(2, mVertices[3]); + + // A valid rhombus must (a) Have vertices (0, 1, 2) make a valid isosceles triangle, + // (b) Have vertices (0, 2, 3) make a valid isosceles triangle, and (c) Have all + // sides of equal length + return firstTriangle.validate() && secondTriangle.validate() + && (double_eq(sideOne, sideTwo) && double_eq(sideTwo, sideThree) && double_eq(sideThree, sideFour)); +} \ No newline at end of file diff --git a/Rhombus.h b/Rhombus.h new file mode 100644 index 0000000..926f127 --- /dev/null +++ b/Rhombus.h @@ -0,0 +1,9 @@ +#ifndef RHOMBUS_H +#define RHOMBUS_H +#include "Quadrilateral.h" +class Rhombus : public AQuadrilateral { + public: + bool validate() override; +}; + +#endif // RHOMBUS_H diff --git a/ScaleneTriangle.cpp b/ScaleneTriangle.cpp new file mode 100644 index 0000000..e0740e4 --- /dev/null +++ b/ScaleneTriangle.cpp @@ -0,0 +1,12 @@ +#include "ScaleneTriangle.h" +#include "GeometryUtils.h" + +bool ScaleneTriangle::validate() { + double sideOne = calculate_distance(mVertices[0], mVertices[1]); + double sideTwo = calculate_distance(mVertices[1], mVertices[2]); + double sideThree = calculate_distance(mVertices[2], mVertices[0]); + + // Scalene triangles must (a) Be a triangle and (b) Have no sides that equal each other + return lengths_make_triangle(sideOne, sideTwo, sideThree) + && (!double_eq(sideOne, sideTwo) && !double_eq(sideTwo, sideThree) && !double_eq(sideThree, sideOne)); +} \ No newline at end of file diff --git a/ScaleneTriangle.h b/ScaleneTriangle.h new file mode 100644 index 0000000..fb6b190 --- /dev/null +++ b/ScaleneTriangle.h @@ -0,0 +1,9 @@ +#ifndef SCALENE_TRIANGLE_H +#define SCALENE_TRIANGLE_H +#include "Triangle.h" +class ScaleneTriangle : public ATriangle { + public: + bool validate() override; +}; + +#endif // SCALENE_TRIANGLE_H diff --git a/Triangle.cpp b/Triangle.cpp new file mode 100644 index 0000000..616fa7e --- /dev/null +++ b/Triangle.cpp @@ -0,0 +1,6 @@ +#include "Triangle.h" + +ATriangle::ATriangle() { + mNumVertices = 3; + mVertices = new Coordinate[3]; +} \ No newline at end of file diff --git a/Triangle.h b/Triangle.h new file mode 100644 index 0000000..0eb0536 --- /dev/null +++ b/Triangle.h @@ -0,0 +1,9 @@ +#ifndef TRIANGLE_H +#define TRIANGLE_H +#include "Polygon.h" +class ATriangle : public APolygon { + public: + ATriangle(); +}; + +#endif // TRIANGLE_H diff --git a/main.cpp b/main.cpp new file mode 100644 index 0000000..b05d4f7 --- /dev/null +++ b/main.cpp @@ -0,0 +1,112 @@ +/** + * @author Tyler Beckman (tyler_beckman@mines.edu) + * @brief A program template for CSCI200 + * @version 1 + * @date 2024-09-21 + */ + +#include "Coordinate.h" +#include "EquilateralTriangle.h" +#include "IsoscelesTriangle.h" +#include "Polygon.h" +#include "Rhombus.h" +#include "ScaleneTriangle.h" + +#include +#include + +#include + +#include + +int main(void) { + // Start file parsing logic + std::cout << "Please enter file path to read polygons from: "; + std::string filePath; + std::cin >> filePath; + + std::ifstream file(filePath); + if (file.fail()) { + std::cout << "Failed to open specified file path " << filePath + << ", does it exist?" << std::endl; + return 1; + } + + std::vector polygonList; + APolygon *currentPolygon; + char type; + double x1, y1, x2, y2, x3, y3, x4, y4; + int r, g, b; + + while (true) { + file >> type >> x1 >> y1 >> x2 >> y2 >> x3 >> y3; + if (type == 'R') { + file >> x4 >> y4; + } + file >> r >> g >> b; + + if (file.fail()) { + break; + } + + switch (type) { + case 'S': + currentPolygon = new ScaleneTriangle; + break; + case 'I': + currentPolygon = new IsoscelesTriangle; + break; + case 'E': + currentPolygon = new EquilateralTriangle; + break; + case 'R': + currentPolygon = new Rhombus; + break; + default: + std::cout << "polygon is invalid - \"" << type << " " << x1 + << " " << y1 << " " << x2 << " " << y2 << " " << x3 + << " " << y3 << " " << x4 << " " << y4 << " " << r + << " " << g << " " << b << "\"" << std::endl; + continue; + } + + currentPolygon->setCoordinate(0, Coordinate(x1, y1)); + currentPolygon->setCoordinate(1, Coordinate(x2, y2)); + currentPolygon->setCoordinate(2, Coordinate(x3, y3)); + if (type == 'R') { + currentPolygon->setCoordinate(3, Coordinate(x4, y4)); + } + currentPolygon->setColor(sf::Color(r, g, b)); + + if (!currentPolygon->validate()) { + std::cout << "polygon is invalid - \"" << type << " " << x1 << " " + << y1 << " " << x2 << " " << y2 << " " << x3 << " " << y3 + << " " << x4 << " " << y4 << " " << r << " " << g << " " + << b << "\"" << std::endl; + } else { + polygonList.push_back(currentPolygon); + } + }; + + // Start SFML Rendering logic + sf::RenderWindow window( sf::VideoMode(640, 640), ":3" ); + window.setVerticalSyncEnabled(true); + + sf::Event event; + + while (window.isOpen()) { + window.clear(); + + for (size_t i = 0; i < polygonList.size(); i++) { + polygonList.at(i)->draw(window); + } + + window.display(); + + while (window.pollEvent(event)) { + if (event.type == sf::Event::Closed) { + window.close(); + } + } + } +} diff --git a/polygons.dat b/polygons.dat new file mode 100644 index 0000000..db128c0 --- /dev/null +++ b/polygons.dat @@ -0,0 +1,44 @@ +R 112.1539030917 200 112.1539030917 440 320 320 320 80 200 200 255 +E 320 80 527.8460969083 200 320 320 200 200 255 +R 320 560 527.8460969083 440 527.8460969083 200 320 320 100 100 255 +E 320 560 527.8460969083 440 320 320 100 100 255 +I 320 560 112.1539030917 440 320 320 100 100 255 +I 310 280 330 280 320 320 255 255 0 +I 310 360 330 360 320 320 255 255 0 +I 310 360 310 280 320 320 255 255 0 +I 330 280 330 360 320 320 255 255 0 +I 280 310 320 320 280 330 255 255 0 +I 360 310 320 320 360 330 255 255 0 +I 280 310 360 310 320 320 255 255 0 +I 280 330 360 330 320 320 255 255 0 +S 406 310 436 310 406 330 255 0 255 +S 406 330 436 310 436 330 255 0 255 +S 456 310 486 310 486 330 255 0 255 +S 456 310 486 330 456 330 255 0 255 +S 436 280 456 280 456 360 255 0 255 +S 436 280 456 360 436 360 255 0 255 +S 140 240 320 160 320 200 255 255 255 +S 140 240 320 200 140 280 255 255 255 +S 140 400 140 360 320 440 255 255 255 +S 320 480 140 400 320 440 255 255 255 +S 140 240 180 240 140 400 255 255 255 +S 140 400 180 240 180 400 255 255 255 +E 0 0 5 5 10 10 255 255 255 +I 0 0 5 5 10 10 255 255 255 +E 0 0 5 5 11 11 255 255 255 +I 0 0 5 5 11 11 255 255 255 +S 0 0 0 0 0 0 255 255 255 +I 0 0 0 0 0 0 255 255 255 +E 0 0 0 0 0 0 255 255 255 +S 10 0 10 0 0 0 255 255 255 +I 10 0 10 0 0 0 255 255 255 +E 10 0 10 0 0 0 255 255 255 +S 0 0 10 0 10 0 255 255 255 +I 0 0 10 0 10 0 255 255 255 +E 0 0 10 0 10 0 255 255 255 +S 10 0 0 0 10 0 255 255 255 +I 10 0 0 0 10 0 255 255 255 +E 10 0 0 0 10 0 255 255 255 +R 112.1539030917 200 112.1539030917 440 527.8460969083 440 527.8460969083 200 255 255 255 +R 0 0 10 10 20 20 30 30 255 255 255 +R 0 10 20 20 20 10 0 10 255 255 255 \ No newline at end of file