Mercurial > ldforge2 / file diff

--- a/src/linetypes/conditionaledge.h	Sun Jan 26 01:06:27 2020 +0200
+++ b/src/linetypes/conditionaledge.h	Sun Jan 26 14:29:30 2020 +0200
@@ -11,18 +11,18 @@
 public:
 	ConditionalEdge() = default;
 	ConditionalEdge(
-		const Point3D& point_1,
-		const Point3D& point_2,
-		const Point3D& controlPoint_1,
-		const Point3D& controlPoint_2,
+		const glm::vec3& point_1,
+		const glm::vec3& point_2,
+		const glm::vec3& controlPoint_1,
+		const glm::vec3& controlPoint_2,
 		const Color colorIndex = colors::edge);
-	ConditionalEdge(const QVector<Point3D>& vertices, const Color color);
+	ConditionalEdge(const QVector<glm::vec3>& vertices, const Color color);
 	QVariant getProperty(Property property) const override;
 	SetPropertyResult setProperty(
 		Property property,
 		const QVariant& value) override;
 	QString textRepresentation() const override;
 private:
-	Point3D controlPoint_1 = {};
-	Point3D controlPoint_2 = {};
+	glm::vec3 controlPoint_1 = {};
+	glm::vec3 controlPoint_2 = {};
 };