src/editmodes/circleMode.cpp

Mon, 04 Jun 2018 23:22:52 +0300

author
Teemu Piippo <teemu@hecknology.net>
date
Mon, 04 Jun 2018 23:22:52 +0300
changeset 1392
0541d9b21968
parent 1390
3eace926af7f
child 1399
f52ea4078f5d
permissions
-rw-r--r--

fix compiler warnings

829
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
1 /*
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
2 * LDForge: LDraw parts authoring CAD
1326
69a90bd2dba2 Happy new year 2018
Teemu Piippo <teemu@hecknology.net>
parents: 1319
diff changeset
3 * Copyright (C) 2013 - 2018 Teemu Piippo
829
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
4 *
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
5 * This program is free software: you can redistribute it and/or modify
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
6 * it under the terms of the GNU General Public License as published by
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
7 * the Free Software Foundation, either version 3 of the License, or
1006
a6b462051ae0 Copyright header fix, some minor stuff
Teemu Piippo <crimsondusk64@gmail.com>
parents: 986
diff changeset
8 * (at your option) any later version.
829
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
9 *
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
10 * This program is distributed in the hope that it will be useful,
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
13 * GNU General Public License for more details.
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
14 *
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
15 * You should have received a copy of the GNU General Public License
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
17 */
bb903e89e23c - now with license headers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 827
diff changeset
18
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
19 #include <QPainter>
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 829
diff changeset
20 #include "circleMode.h"
1145
02264bf0108d Renamed ldDocument.cpp → lddocument.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1139
diff changeset
21 #include "../lddocument.h"
842
e1c9010eb9e8 - moved ringFinder into root source directory, clearing the src/misc/ directory
Teemu Piippo <crimsondusk64@gmail.com>
parents: 840
diff changeset
22 #include "../ringFinder.h"
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
23 #include "../primitives.h"
1104
edddb9b0db9e Moved document editing methods from GLRenderer to Canvas
Teemu Piippo <teemu@hecknology.net>
parents: 1088
diff changeset
24 #include "../canvas.h"
962
a4b463a7ee82 Rename MainWindow files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 958
diff changeset
25 #include "../mainwindow.h"
1151
0eddb5bcf25b Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents: 1149
diff changeset
26 #include "../documentmanager.h"
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
27 #include "../grid.h"
1149
502c866b8512 Moved LDQuadrilateral into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1147
diff changeset
28 #include "../linetypes/modelobject.h"
502c866b8512 Moved LDQuadrilateral into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1147
diff changeset
29 #include "../linetypes/quadrilateral.h"
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1263
diff changeset
30 #include "../algorithms/geometry.h"
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
31
1104
edddb9b0db9e Moved document editing methods from GLRenderer to Canvas
Teemu Piippo <teemu@hecknology.net>
parents: 1088
diff changeset
32 CircleMode::CircleMode(Canvas* canvas) :
edddb9b0db9e Moved document editing methods from GLRenderer to Canvas
Teemu Piippo <teemu@hecknology.net>
parents: 1088
diff changeset
33 Super {canvas} {}
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
34
1030
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
35
827
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
36 EditModeType CircleMode::type() const
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
37 {
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
38 return EditModeType::Circle;
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
39 }
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
40
1030
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
41
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
42 double CircleMode::getCircleDrawDist(int position) const
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
43 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
44 if (countof(m_drawedVerts) >= position + 1)
958
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
45 {
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
46 Vertex v1;
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
47
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
48 if (countof(m_drawedVerts) >= position + 2)
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
49 v1 = m_drawedVerts[position + 1];
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
50 else
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
51 v1 = renderer()->currentCamera().convert2dTo3d(renderer()->mousePosition(), grid());
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
52
958
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
53 Axis localx, localy;
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
54 renderer()->getRelativeAxes(localx, localy);
958
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
55 double dx = m_drawedVerts[0][localx] - v1[localx];
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
56 double dy = m_drawedVerts[0][localy] - v1[localy];
1180
2005e4147ad6 Grid::snap now snaps points.
Teemu Piippo <teemu@hecknology.net>
parents: 1179
diff changeset
57 return grid()->snap({hypot(dx, dy), 0}).x();
958
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
58 }
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
59
1dc890c73e01 Removed all asserts from the code. Removed assert handling and the bomb box dialog.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
60 return 0.0;
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
61 }
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
62
1392
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
63 #if 0
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
64 static Matrix shearMatrixForPlane(Canvas* renderer)
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
65 {
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
66 const Plane& plane = renderer->drawPlane();
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
67 Axis localx, localy;
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
68 renderer->getRelativeAxes(localx, localy);
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
69 Axis localz = renderer->getRelativeZ();
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
70 Matrix shearMatrix = Matrix::identity;
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
71 Vertex normalAsVertex = Vertex::fromVector(plane.normal);
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
72
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
73 // Compute shear matrix values. The (Y, X) cell means a slope for Y in regard to X.
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
74 // If x grows by 2, y grows by 2 times this value. In the circle primitives,
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
75 // depth is Y, but in the orthogonal view, depth is Z. So Y and Z must be swapped.
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
76 if (not qFuzzyCompare(normalAsVertex[localz], 0.0))
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
77 {
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
78 // The slope of the vector is 90° offset from the normal vector. So Y/X slope is
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
79 // -X/Y from the normal vector.
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
80 shearMatrix(Y, X) = -normalAsVertex[localx] / normalAsVertex[localz];
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
81 shearMatrix(Y, Z) = -normalAsVertex[localy] / normalAsVertex[localz];
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
82 }
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
83
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
84 return shearMatrix;
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
85 }
1392
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
86 #endif
1030
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
87
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
88 void CircleMode::endDraw()
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
89 {
1079
67c6e5d32e68 More rework on model stuff, removals of LDSpawn calls. Most importantly, the LDraw code parsing function was moved to Model.
Teemu Piippo <teemu@hecknology.net>
parents: 1077
diff changeset
90 Model model {m_documents};
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
91 PrimitiveModel primitiveModel;
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
92 primitiveModel.segments = m_window->ringToolSegments();
1339
1f342d5abc85 Added support for 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1328
diff changeset
93 primitiveModel.divisions = m_window->ringToolDivisions();
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
94 primitiveModel.ringNumber = 0;
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
95 double dist0 (getCircleDrawDist (0));
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
96 double dist1 (getCircleDrawDist (1));
1053
2a48c0fff107 Refactor primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1045
diff changeset
97 LDDocument* primitiveFile;
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
98 Matrix transform;
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
99
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
100 bool circleOrDisc = false;
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
101
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
102 if (dist1 < dist0)
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
103 qSwap(dist0, dist1);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
104
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
105 if (qFuzzyCompare(dist0, dist1))
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
106 {
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
107 // Special case: radii are the same, there's no area. Use a circle.
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
108 primitiveModel.type = PrimitiveModel::Circle;
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
109 primitiveFile = primitives()->getPrimitive(primitiveModel);
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
110 // transform = shearMatrixForPlane(renderer());
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
111 transform = Matrix::fromQMatrix(renderer()->currentCamera().transformationMatrix(1));
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
112 transform *= Matrix::scaleMatrix(dist0);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
113 circleOrDisc = true;
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
114 }
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
115 else if (qFuzzyCompare(dist0, 0) or qFuzzyCompare(dist1, 0))
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
116 {
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
117 // Special case #2: one radius is 0, so use a disc.
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
118 primitiveModel.type = PrimitiveModel::Disc;
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
119 primitiveFile = primitives()->getPrimitive(primitiveModel);
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
120 //transform = shearMatrixForPlane(renderer());
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
121 transform = Matrix::fromQMatrix(renderer()->currentCamera().transformationMatrix(1));
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
122 transform *= Matrix::scaleMatrix(max(dist0, dist1));
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
123 circleOrDisc = true;
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
124 }
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
125 else if (g_RingFinder.findRings(dist0, dist1)) // Consult the ring finder now
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
126 {
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
127 // The ring finder found a solution, use that. Add the component rings to the file.
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
128 primitiveModel.type = PrimitiveModel::Ring;
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1018
diff changeset
129
1053
2a48c0fff107 Refactor primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1045
diff changeset
130 for (const RingFinder::Component& component : g_RingFinder.bestSolution()->getComponents())
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
131 {
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
132 primitiveModel.ringNumber = component.num;
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
133 primitiveFile = primitives()->getPrimitive(primitiveModel);
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
134 Matrix matrix = Matrix::fromQMatrix(renderer()->currentCamera().transformationMatrix(component.scale));
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
135 // matrix = shearMatrixForPlane(renderer()) * matrix;
1263
0256edecda54 LDSubfileReference now contains the name of the subfile and not a pointer anymore. Some methods now require a DocumentManager* for context on resolving the name.
Santeri Piippo
parents: 1261
diff changeset
136 model.emplace<LDSubfileReference>(primitiveFile->name(), matrix, m_drawedVerts.first());
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
137 }
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
138 }
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
139 else
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
140 {
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
141 // Ring finder failed, last resort: draw the ring with quads
1392
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
142 Axis localx, localy;
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
143 renderer()->getRelativeAxes (localx, localy);
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
144 double x0 = m_drawedVerts[0][localx];
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
145 double y0 = m_drawedVerts[0][localy];
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
146
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
147 Vertex templ;
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
148 templ.setCoordinate(localx, x0);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
149 templ.setCoordinate(localy, y0);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
150
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
151 // Calculate circle coords
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
152 QVector<QLineF> c0 = makeCircle(primitiveModel.segments, primitiveModel.divisions, dist0);
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
153 QVector<QLineF> c1 = makeCircle(primitiveModel.segments, primitiveModel.divisions, dist1);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
154
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
155 for (int i = 0; i < primitiveModel.segments; ++i)
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
156 {
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
157 Vertex v0, v1, v2, v3;
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
158 v0 = v1 = v2 = v3 = templ;
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
159 v0.setCoordinate (localx, v0[localx] + c0[i].x1());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
160 v0.setCoordinate (localy, v0[localy] + c0[i].y1());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
161 v1.setCoordinate (localx, v1[localx] + c0[i].x2());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
162 v1.setCoordinate (localy, v1[localy] + c0[i].y2());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
163 v2.setCoordinate (localx, v2[localx] + c1[i].x2());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
164 v2.setCoordinate (localy, v2[localy] + c1[i].y2());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
165 v3.setCoordinate (localx, v3[localx] + c1[i].x1());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
166 v3.setCoordinate (localy, v3[localy] + c1[i].y1());
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
167
1261
5d2c9d36da9d Removed LDObject::invert, inversion code moved to basic toolset
Santeri Piippo
parents: 1180
diff changeset
168 // Ensure the quads always are BFC-front towards the camera
5d2c9d36da9d Removed LDObject::invert, inversion code moved to basic toolset
Santeri Piippo
parents: 1180
diff changeset
169 if (static_cast<int>(renderer()->camera()) % 3 <= 0)
5d2c9d36da9d Removed LDObject::invert, inversion code moved to basic toolset
Santeri Piippo
parents: 1180
diff changeset
170 qSwap(v1, v3);
5d2c9d36da9d Removed LDObject::invert, inversion code moved to basic toolset
Santeri Piippo
parents: 1180
diff changeset
171
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
172 // Project the vertices onto the draw plane.
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
173 for (Vertex* vertex : {&v0, &v1, &v2, &v3})
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
174 *vertex = projectToDrawPlane(*vertex);
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
175
1139
51303023d651 LDObject subclass renaming:
Teemu Piippo <teemu@hecknology.net>
parents: 1134
diff changeset
176 LDQuadrilateral* quad = model.emplace<LDQuadrilateral>(v0, v1, v2, v3);
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
177 quad->setColor(MainColor);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
178 }
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
179 }
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
180
1053
2a48c0fff107 Refactor primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1045
diff changeset
181 if (circleOrDisc and primitiveFile)
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
182 {
1263
0256edecda54 LDSubfileReference now contains the name of the subfile and not a pointer anymore. Some methods now require a DocumentManager* for context on resolving the name.
Santeri Piippo
parents: 1261
diff changeset
183 model.emplace<LDSubfileReference>(primitiveFile->name(), transform, m_drawedVerts.first());
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1344
diff changeset
184 }
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
185
1077
952d6b3e7d11 Replaced uses of LDSpawn with the Model class in edit modes
Teemu Piippo <teemu@hecknology.net>
parents: 1073
diff changeset
186 finishDraw (model);
825
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
187 }
f7649c9bfd9a - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 824
diff changeset
188
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
189 /*
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
190 * Which way around will we place our circle primitive? This only makes a difference if we're not drawing a full circle.
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
191 * Result is an angle offset in radians.
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
192 */
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
193 double CircleMode::orientation() const
869
7184f3bae695 - circle tool is now able to rotate the partial circular primitives spawned
Teemu Piippo <crimsondusk64@gmail.com>
parents: 866
diff changeset
194 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
195 if (not m_drawedVerts.isEmpty())
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
196 {
1339
1f342d5abc85 Added support for 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1328
diff changeset
197 int divisions = m_window->ringToolDivisions();
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
198 QPointF originSpot = renderer()->currentCamera().convert3dTo2d(m_drawedVerts.first());
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
199 // Line from the origin of the circle to current mouse position
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
200 QLineF hand1 = {originSpot, renderer()->mousePositionF()};
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
201 // Line from the origin spot to
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
202 QLineF hand2 = {{0, 0}, {1, 0}};
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
203 // Calculate the angle between these hands and round it to whole divisions.
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
204 double angleoffset = roundToInterval(-hand1.angleTo(hand2), 360.0 / divisions);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
205 // Take the camera's depth coefficient into account here. This way, the preview is flipped if the
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
206 // primitive also would be.
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
207 return angleoffset * pi / 180.0 * renderer()->depthNegateFactor();
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
208 }
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
209 else
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
210 {
873
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
211 return 0.0;
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
212 }
869
7184f3bae695 - circle tool is now able to rotate the partial circular primitives spawned
Teemu Piippo <crimsondusk64@gmail.com>
parents: 866
diff changeset
213 }
7184f3bae695 - circle tool is now able to rotate the partial circular primitives spawned
Teemu Piippo <crimsondusk64@gmail.com>
parents: 866
diff changeset
214
1030
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
215
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
216 void CircleMode::render (QPainter& painter) const
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
217 {
827
82469b40567e - now compiles
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
218 QFontMetrics metrics = QFontMetrics (QFont());
824
6add2126e7ff - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 823
diff changeset
219
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
220 // If we have not specified the center point of the circle yet, preview it on the screen.
861
83426c5fa732 - major identifier renaming
Teemu Piippo <crimsondusk64@gmail.com>
parents: 848
diff changeset
221 if (m_drawedVerts.isEmpty())
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
222 {
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
223 QPoint position2d = renderer()->currentCamera().convert3dTo2d(renderer()->position3D());
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
224 renderer()->drawPoint(painter, position2d);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
225 renderer()->drawBlipCoordinates(painter, renderer()->position3D(), position2d);
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
226 return;
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
227 }
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
228
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
229 QVector<Vertex> innerverts, outerverts;
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
230 QVector<QPointF> innerverts2d, outerverts2d;
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
231 double innerdistance = getCircleDrawDist(0);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
232 double outerdistance = countof(m_drawedVerts) >= 2 ? getCircleDrawDist (1) : -1;
1339
1f342d5abc85 Added support for 8-primitives
Teemu Piippo <teemu@hecknology.net>
parents: 1328
diff changeset
233 int divisions = m_window->ringToolDivisions();
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
234 int segments = m_window->ringToolSegments();
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
235 double angleUnit = 2 * pi / divisions;
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
236 Axis relX, relY;
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
237 renderer()->getRelativeAxes(relX, relY);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
238 double angleoffset = (countof(m_drawedVerts) < 3 ? orientation() : m_angleOffset);
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
239
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
240 // Calculate the preview positions of vertices
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
241 for (int i = 0; i < segments + 1; ++i)
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
242 {
1344
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
243 const double sinangle = ldrawsin(angleoffset + i * angleUnit);
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
244 const double cosangle = ldrawcos(angleoffset + i * angleUnit);
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
245 Vertex vertex;
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
246 vertex.setCoordinate (relX, m_drawedVerts[0][relX] + (cosangle * innerdistance));
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
247 vertex.setCoordinate (relY, m_drawedVerts[0][relY] + (sinangle * innerdistance));
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
248 innerverts << vertex;
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
249 innerverts2d << renderer()->currentCamera().convert3dTo2d(vertex);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
250
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
251 if (outerdistance != -1)
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
252 {
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
253 vertex.setCoordinate (relX, m_drawedVerts[0][relX] + (cosangle * outerdistance));
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
254 vertex.setCoordinate (relY, m_drawedVerts[0][relY] + (sinangle * outerdistance));
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
255 outerverts << vertex;
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
256 outerverts2d << renderer()->currentCamera().convert3dTo2d(vertex);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
257 }
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
258 }
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
259
1344
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
260 QVector<QLineF> lines;
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
261
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
262 if (outerdistance != -1 and outerdistance != innerdistance)
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
263 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
264 painter.setBrush(m_polybrush);
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
265 painter.setPen(Qt::NoPen);
1344
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
266 lines.reserve(segments * 2);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
267
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
268 // Compile polygons
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
269 for (int i = 0; i < segments; ++i)
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
270 {
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
271 QVector<QPointF> points;
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
272 points << innerverts2d[i]
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
273 << innerverts2d[i + 1]
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
274 << outerverts2d[i + 1]
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
275 << outerverts2d[i];
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
276 painter.drawPolygon (QPolygonF (points));
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
277 lines.append({innerverts2d[i], innerverts2d[i + 1]});
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
278 lines.append({outerverts2d[i], outerverts2d[i + 1]});
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
279 }
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
280
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
281 // Add bordering edges for unclosed rings/discs
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
282 if (segments != divisions)
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
283 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
284 lines.append({innerverts2d.first(), outerverts2d.first()});
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
285 lines.append({innerverts2d.last(), outerverts2d.last()});
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
286 }
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
287 }
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
288 else
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
289 {
1344
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
290 lines.reserve(segments);
d28f6ff1b1f0 fixed rendering artifacts
Teemu Piippo <teemu@hecknology.net>
parents: 1339
diff changeset
291
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
292 for (int i = 0; i < segments; ++i)
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
293 lines.append({innerverts2d[i], innerverts2d[i + 1]});
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
294 }
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
295
1008
74cb432812d3 Fixed circle, rectangle and line path modes not working anymore. Add blip coordinates to curve and line path modes. Circle mode for now only can show the coordinates of the initial blip
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1006
diff changeset
296 // Draw green blips at where the points are
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
297 for (const QPointF& point : innerverts2d + outerverts2d)
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
298 renderer()->drawPoint(painter, point);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
299
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
300 // Draw edge lines
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
301 painter.setPen(renderer()->linePen());
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
302 painter.drawLines(lines);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
303
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
304 // Draw the current radius in the middle of the circle.
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1123
diff changeset
305 QPoint origin = renderer()->currentCamera().convert3dTo2d (m_drawedVerts[0]);
866
4951b737f8cb - now able to spawn partial circular primitives
Teemu Piippo <crimsondusk64@gmail.com>
parents: 865
diff changeset
306 QString label = QString::number (innerdistance);
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
307 painter.setPen(renderer()->textPen());
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
308 painter.drawText(origin.x() - (metrics.width(label) / 2), origin.y(), label);
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
309
1065
c8ecddbd99e9 Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents: 1063
diff changeset
310 if (countof(m_drawedVerts) >= 2)
865
6d68840fcb26 - circle mode can now do hi-res
Teemu Piippo <crimsondusk64@gmail.com>
parents: 861
diff changeset
311 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
312 painter.drawText(origin.x() - (metrics.width(label) / 2),
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
313 origin.y() + metrics.height(), QString::number(outerdistance));
823
1a2f593f0c02 - saving work done on edit mode revamp
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
314 }
824
6add2126e7ff - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 823
diff changeset
315 }
6add2126e7ff - more work on edit modes
Santeri Piippo <crimsondusk64@gmail.com>
parents: 823
diff changeset
316
873
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
317
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
318 bool CircleMode::preAddVertex (const Vertex&)
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
319 {
1088
c6d242d2b619 Reworked and cleaned up the circle mode
Teemu Piippo <teemu@compsta2.com>
parents: 1082
diff changeset
320 m_angleOffset = orientation();
873
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
321 return false;
201083693300 - circle mode now locks the angle offset on final confirmation stage
Teemu Piippo <crimsondusk64@gmail.com>
parents: 870
diff changeset
322 }
1030
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
323
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
324
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
325 int CircleMode::maxVertices() const
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
326 {
d931a7547578 Fixed circle mode not building the circle anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1026
diff changeset
327 return 3;
1045
f726f8f49c7e Unabbreviate "transform" to "transformationMatrix"
Teemu Piippo <teemu@hecknology.net>
parents: 1030
diff changeset
328 }

mercurial