Tue, 11 Apr 2023 11:11:28 +0300
More refactor and renaming
Added a test function that makes recolors stuff red
264
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
1 | #include "src/vertexmap.h" |
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
2 | #include "src/gl/common.h" |
117 | 3 | |
259
c27612f0eac0
- Made it build under Qt6
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
250
diff
changeset
|
4 | hash_t hashVertex(const glm::vec3& vec) |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
5 | { |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
6 | return qHash(glm::ivec3{ |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
7 | int(vec.x * 10000), |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
8 | int(vec.y * 10000), |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
9 | int(vec.z * 10000), |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
10 | }); |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
11 | } |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
12 | |
338 | 13 | VertexMap::VertexMap(const QTextDocument *model) : |
117 | 14 | model{model} |
15 | { | |
16 | this->build(); | |
17 | } | |
18 | ||
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
19 | struct Edge |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
20 | { |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
21 | const glm::vec3& a; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
22 | const glm::vec3& b; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
23 | }; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
24 | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
25 | static void edges(const PlainPolygonElement& element, std::function<void(Edge&&)> fn) |
200 | 26 | { |
27 | std::visit<void>(overloaded{ | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
28 | [fn](const LineSegment& edge) { |
200 | 29 | fn(Edge{edge.p1, edge.p2}); |
30 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
31 | [fn](const Triangle& triangle) { |
200 | 32 | fn(Edge{triangle.p1, triangle.p2}); |
33 | fn(Edge{triangle.p2, triangle.p3}); | |
34 | fn(Edge{triangle.p3, triangle.p1}); | |
35 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
36 | [fn](const Quadrilateral& quad) { |
200 | 37 | fn(Edge{quad.p1, quad.p2}); |
38 | fn(Edge{quad.p2, quad.p3}); | |
39 | fn(Edge{quad.p3, quad.p4}); | |
40 | fn(Edge{quad.p4, quad.p1}); | |
41 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
42 | [fn](const ConditionalEdge& cedge) { |
200 | 43 | fn(Edge{cedge.p1, cedge.p2}); |
44 | }, | |
45 | }, element); | |
46 | } | |
47 | ||
48 | inline void points( | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
49 | const PlainPolygonElement& element, |
200 | 50 | std::function<void(const glm::vec3&)> fn) |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
51 | { |
200 | 52 | std::visit<void>(overloaded{ |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
53 | [fn](const LineSegment& edge) { |
200 | 54 | fn(edge.p1); |
55 | fn(edge.p2); | |
56 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
57 | [fn](const Triangle& triangle) { |
200 | 58 | fn(triangle.p1); |
59 | fn(triangle.p2); | |
60 | fn(triangle.p3); | |
61 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
62 | [fn](const Quadrilateral& quad) { |
200 | 63 | fn(quad.p1); |
64 | fn(quad.p2); | |
65 | fn(quad.p3); | |
66 | fn(quad.p4); | |
67 | }, | |
374
75efc3ba5a56
More refactor and renaming
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
338
diff
changeset
|
68 | [fn](const ConditionalEdge& cedge) { |
200 | 69 | fn(cedge.p1); |
70 | fn(cedge.p2); | |
71 | fn(cedge.c1); | |
72 | fn(cedge.c2); | |
73 | }, | |
74 | [](const ModelElement&&){} | |
75 | }, element); | |
76 | } | |
77 | ||
78 | template<typename R> | |
79 | auto ifplanar( | |
80 | const ModelElement& element, | |
81 | std::function<R(const glm::vec3&, const glm::vec3&, const glm::vec3&)> fn | |
82 | ) | |
83 | { | |
84 | return std::visit(overloaded{ | |
85 | [fn](const Triangle& triangle) -> std::optional<R> { | |
86 | return fn(triangle.p1, triangle.p2, triangle.p3); | |
87 | }, | |
88 | [fn](const Quadrilateral quad) -> std::optional<R> { | |
89 | return fn(quad.p1, quad.p2, quad.p3); | |
90 | }, | |
91 | [](const ModelElement&&) -> std::optional<R> {return {};} | |
92 | }, element); | |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
93 | } |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
94 | |
117 | 95 | void VertexMap::build() |
96 | { | |
97 | this->map.clear(); | |
118 | 98 | this->vertices.clear(); |
119 | 99 | this->vertexHashes.clear(); |
333
07e65a4c6611
Experiment to delete the Model class and rely solely on text documents
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
309
diff
changeset
|
100 | #if 0 |
250
2837b549e616
I felt that the compiler was too kind to me, so I enabled a big pile of warnings
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
200
diff
changeset
|
101 | for (std::size_t i = 0; i < this->model->size(); ++i) |
117 | 102 | { |
200 | 103 | const ModelElement& element = this->model->at(i); |
104 | std::optional<glm::mat4> matrix = ifplanar<glm::mat4>( | |
105 | element, | |
106 | [](const glm::vec3& p1, const glm::vec3& p2, const glm::vec3& p3) | |
107 | { | |
108 | const glm::vec3 a = glm::normalize(p2 - p1); | |
109 | const glm::vec3 b = glm::normalize(p3 - p1); | |
110 | const glm::vec3 c = glm::normalize(glm::cross(a, b)); | |
111 | const glm::vec3 d = glm::normalize(glm::cross(a, c)); | |
112 | return glm::mat4{{a, 0}, {-c, 0}, {d, 0}, {}}; | |
113 | }); | |
114 | points(element, [&](const glm::vec3 point) { | |
259
c27612f0eac0
- Made it build under Qt6
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
250
diff
changeset
|
115 | const hash_t hash = hashVertex(point); |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
116 | VertexInfo& info = this->map[hash]; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
117 | info.point = point; |
200 | 118 | info.objects.insert(this->model->idAt(i)); |
119 | if (matrix.has_value() and not info.transformSet) | |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
120 | { |
200 | 121 | info.transform = matrix.value(); |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
122 | info.transform[3] = {point, 1}; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
123 | info.transformSet = true; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
124 | } |
119 | 125 | if (not this->vertexHashes.contains(hash)) |
126 | { | |
127 | this->vertexHashes.insert(hash); | |
128 | this->vertices.push_back(point); | |
129 | } | |
200 | 130 | }); |
131 | } | |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
132 | for (auto& pair : this->map) |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
133 | { |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
134 | auto& info = pair.second; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
135 | // If there's no transformation calculated yet, make up a simple one that at least |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
136 | // contains translation. |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
137 | if (not info.transformSet) |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
138 | { |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
139 | info.transform = glm::translate(glm::identity<glm::mat4>(), info.point); |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
140 | info.transformSet = true; |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
141 | } |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
142 | float scale = 1.0f; |
309
d862721d19a3
Fixed ModelId being used to identify both models and elements, added ElementId to identify elements
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
143 | for (const ElementId objectId : info.objects) |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
144 | { |
200 | 145 | const std::optional<int> index = model->find(objectId); |
146 | if (index.has_value()) { | |
250
2837b549e616
I felt that the compiler was too kind to me, so I enabled a big pile of warnings
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
200
diff
changeset
|
147 | edges(this->model->at(unsigned_cast(index.value())), [&](Edge&& edge) |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
148 | { |
200 | 149 | if (hashVertex(edge.a) == pair.first or hashVertex(edge.b) == pair.first) |
150 | { | |
151 | scale = std::min(scale, glm::length(edge.b - edge.a) / 3); | |
152 | } | |
153 | }); | |
154 | } | |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
155 | } |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
156 | info.transform = glm::scale(info.transform, glm::vec3{scale, scale, scale}); |
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
157 | } |
333
07e65a4c6611
Experiment to delete the Model class and rely solely on text documents
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
309
diff
changeset
|
158 | #endif |
118 | 159 | Q_EMIT this->verticesChanged(); |
117 | 160 | } |
118 | 161 | |
162 | /** | |
163 | * @brief Apply \c fn for all vertices in the map. | |
164 | * @param fn | |
165 | */ | |
166 | void VertexMap::apply(ApplyFunction fn) const | |
167 | { | |
119 | 168 | for (unsigned int i = 0; i < this->vertices.size(); i += 1) |
118 | 169 | { |
119 | 170 | const glm::vec3& point = this->vertices[i]; |
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
171 | fn(point, this->map.at(hashVertex(point))); |
118 | 172 | } |
173 | } |