Mercurial > ldforge2 / file diff

--- a/src/layers/edittools.h	Fri Jul 01 23:48:27 2022 +0300
+++ b/src/layers/edittools.h	Fri Jul 01 23:51:16 2022 +0300
@@ -44,6 +44,7 @@
 	glm::mat4 mvpMatrix;
 	glm::mat4 gridMatrix{1};
 	Plane gridPlane;
+	QPointF localPosition;
 	opt<glm::vec3> worldPosition;
 	CircleToolOptions circleToolOptions = {
 		.fraction = {16, 16},
@@ -53,8 +54,8 @@
 	explicit EditTools(QObject *parent = nullptr);
 	~EditTools() override;
 	void applyToVertices(VertexMap::ApplyFunction fn) const;
-	const QSet<ModelId> selectedObjects() const;
-	EditingMode currentEditingMode() const;
+	[[nodiscard]] const QSet<ModelId> selectedObjects() const;
+	[[nodiscard]] EditingMode currentEditingMode() const;
 	Q_SLOT void setEditMode(EditingMode mode);
 	Q_SLOT void setGridMatrix(const glm::mat4& gridMatrix);
 	Q_SLOT void setCircleToolOptions(const CircleToolOptions& options);
@@ -69,12 +70,13 @@
 	void mouseClick(const QMouseEvent* event) override;
 	void overpaint(QPainter* painter) override;
 private:
-	const std::vector<ModelAction> modelActions() const;
-	const std::vector<ModelAction> circleModeActions() const;
-	const std::vector<ModelAction> drawModeActions() const;
+	[[nodiscard]] const std::vector<ModelAction> modelActions() const;
+	[[nodiscard]] const std::vector<ModelAction> circleModeActions() const;
+	[[nodiscard]] const std::vector<ModelAction> drawModeActions() const;
 	bool usePolygon() const;
 	void closeShape();
 	void renderPreview(QPainter* painter, const void* pensptr);
 	void removeLastPoint();
-	bool isCloseToExistingPoints() const;
+	[[nodiscard]] bool isCloseToExistingPoints() const;
+	[[nodiscard]] std::size_t calcNumPoints() const;
 };