diff -r 4bec0525ef1b -r 93ec4d630346 src/linetypes/triangle.h --- a/src/linetypes/triangle.h Thu Mar 19 21:06:06 2020 +0200 +++ b/src/linetypes/triangle.h Wed Mar 25 16:07:20 2020 +0200 @@ -6,25 +6,12 @@ class Triangle; } -class ldraw::Triangle : public ColoredObject +class ldraw::Triangle : public PolygonObject<3> { public: - Triangle() = default; - Triangle( - const glm::vec3 &point_1, - const glm::vec3 &point_2, - const glm::vec3 &point_3, - Color colorIndex = ldraw::mainColor); - Triangle(const std::array& vertices, const Color color); - Triangle(const glm::vec3 (&vertices)[3], const Color color); - QVariant getProperty(Property id) const override; + using PolygonObject<3>::PolygonObject; QString textRepresentation() const override; void getPolygons(std::vector& polygons, GetPolygonsContext* context) const override; void invert() override; - int numPoints() const override; - const glm::vec3& getPoint(int index) const override; - glm::vec3 points[3] = {{}}; -protected: - void setProperty(SetPropertyResult* result, const PropertyKeyValue& pair) override; };