Wed, 11 Mar 2020 17:19:28 +0200
fixed signed vs unsigned nonsense in gl::Compiler::idFromColor
|
15
9e18ec63eec3
split quadrilateral and triangle into their own source files
Teemu Piippo <teemu@hecknology.net>
parents:
14
diff
changeset
|
1 | #include "triangle.h" |
| 3 | 2 | |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
3 | ldraw::Triangle::Triangle( |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
4 | const glm::vec3& point_1, |
|
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
5 | const glm::vec3& point_2, |
|
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
6 | const glm::vec3& point_3, |
| 3 | 7 | Color color_index) : |
| 13 | 8 | ColoredObject{color_index}, |
| 3 | 9 | points{point_1, point_2, point_3} |
| 10 | { | |
| 11 | } | |
| 12 | ||
|
77
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
13 | ldraw::Triangle::Triangle(const std::array<glm::vec3, 3>& vertices, const Color color) : |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
14 | ColoredObject{color}, |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
15 | points{vertices[0], vertices[1], vertices[2]} |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
16 | { |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
17 | } |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
18 | |
|
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
35
diff
changeset
|
19 | ldraw::Triangle::Triangle(const glm::vec3 (&vertices)[3], const Color color) : |
| 13 | 20 | ColoredObject{color}, |
|
8
44679e468ba9
major update with many things
Teemu Piippo <teemu@hecknology.net>
parents:
6
diff
changeset
|
21 | points{vertices[0], vertices[1], vertices[2]} |
|
44679e468ba9
major update with many things
Teemu Piippo <teemu@hecknology.net>
parents:
6
diff
changeset
|
22 | { |
|
44679e468ba9
major update with many things
Teemu Piippo <teemu@hecknology.net>
parents:
6
diff
changeset
|
23 | } |
|
44679e468ba9
major update with many things
Teemu Piippo <teemu@hecknology.net>
parents:
6
diff
changeset
|
24 | |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
25 | QVariant ldraw::Triangle::getProperty(const Property id) const |
| 3 | 26 | { |
| 27 | switch (id) | |
| 28 | { | |
| 29 | case Property::Point1: | |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
30 | return QVariant::fromValue(points[0]); |
| 3 | 31 | case Property::Point2: |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
32 | return QVariant::fromValue(points[1]); |
| 3 | 33 | case Property::Point3: |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
34 | return QVariant::fromValue(points[2]); |
| 3 | 35 | default: |
| 13 | 36 | return ColoredObject::getProperty(id); |
| 3 | 37 | } |
| 38 | } | |
| 39 | ||
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
40 | auto ldraw::Triangle::setProperty(Property id, const QVariant& value) |
| 3 | 41 | -> SetPropertyResult |
| 42 | { | |
| 43 | switch (id) | |
| 44 | { | |
| 45 | case Property::Point1: | |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
46 | points[0] = value.value<glm::vec3>(); |
| 3 | 47 | return SetPropertyResult::Success; |
| 48 | case Property::Point2: | |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
49 | points[1] = value.value<glm::vec3>(); |
| 3 | 50 | return SetPropertyResult::Success; |
| 51 | case Property::Point3: | |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
52 | points[2] = value.value<glm::vec3>(); |
| 3 | 53 | return SetPropertyResult::Success; |
| 54 | default: | |
| 13 | 55 | return ColoredObject::setProperty(id, value); |
| 3 | 56 | } |
| 57 | } | |
| 58 | ||
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
59 | QString ldraw::Triangle::textRepresentation() const |
| 6 | 60 | { |
|
8
44679e468ba9
major update with many things
Teemu Piippo <teemu@hecknology.net>
parents:
6
diff
changeset
|
61 | return utility::format("%1 %2 %3", |
|
33
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
62 | utility::vertexToStringParens(points[0]), |
|
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
63 | utility::vertexToStringParens(points[1]), |
|
4c41bfe2ec6e
replaced matrix and vertex classes with glm
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
64 | utility::vertexToStringParens(points[2])); |
| 6 | 65 | } |
| 21 | 66 | |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
67 | void ldraw::Triangle::getPolygons( |
| 21 | 68 | std::vector<gl::Polygon>& polygons, |
| 69 | GetPolygonsContext* context) const | |
| 70 | { | |
| 71 | Q_UNUSED(context) | |
| 72 | polygons.push_back(gl::triangle( | |
| 73 | this->points[0], | |
| 74 | this->points[1], | |
| 75 | this->points[2], | |
| 76 | this->colorIndex, | |
| 26 | 77 | this->id)); |
| 21 | 78 | } |
| 26 | 79 | |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
33
diff
changeset
|
80 | void ldraw::Triangle::invert() |
| 26 | 81 | { |
| 82 | // 0 1 2 | |
| 83 | // -> 1 0 2 | |
| 84 | std::swap(this->points[0], this->points[1]); | |
| 85 | } |