FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

started working on walling, dooring and windowing

Browse Source 
refactoring
This commit is contained in:
k-a-z-u
2018-07-25 16:21:47 +02:00
parent f7e4323d58
commit 0d22d91470
9 changed files with 368 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
geo/GPCPolygon2.h
View File

@@ -5,6 +5,60 @@
#include "Polygon2.h"
#include "Triangle3.h"
class TriangleStrip {
private:
std::vector<Point3> pts;
public:
void add(const Point3 p) {
pts.push_back(p);
}
void set(const std::vector<Point3>& pts) {
this->pts = pts;
}
void toTriangles(std::vector<Triangle3>& trias) const {
// https://en.wikipedia.org/wiki/Triangle_strip
// GL_TRIANGLE_STRIP
// Draws a series of triangles (three-sided polygons) using vertices v0, v1, v2, then v2, v1, v3 (note the order), then v2, v3, v4, and so on. The ordering is to ensure that the triangles are all drawn with the same orientation so that the strip can correctly form part of a surface.
// For odd n, vertices n, n+1, and n+2 define triangle n. For even n, vertices n+1, n, and n+2 define triangle n. N-2 triangles are drawn.
for (size_t j = 2; j < pts.size(); ++j) {
if (j % 2 == 0) {
Triangle3 tria(
pts[j-2],
pts[j-1],
pts[j]
);
trias.push_back(tria);
} else {
Triangle3 tria(
pts[j-1],
pts[j-2],
pts[j]
);
trias.push_back(tria);
}
}
}
std::vector<Triangle3> toTriangles() const {
std::vector<Triangle3> trias;
toTriangles(trias);
return trias;
}
};
class GPCPolygon2 {
struct GPCPolygon : gpc_polygon {
@@ -113,35 +167,43 @@ public:
for (int i = 0; i < res.num_strips; ++i) {
gpc_vertex_list lst = res.strip[i];
for (int j = 2; j < lst.num_vertices; ++j) {
gpc_vertex& v1 = lst.vertex[j - 2];
gpc_vertex& v2 = lst.vertex[j - 1];
gpc_vertex& v3 = lst.vertex[j];
// https://en.wikipedia.org/wiki/Triangle_strip
// GL_TRIANGLE_STRIP
// Draws a series of triangles (three-sided polygons) using vertices v0, v1, v2, then v2, v1, v3 (note the order), then v2, v3, v4, and so on. The ordering is to ensure that the triangles are all drawn with the same orientation so that the strip can correctly form part of a surface.
// For odd n, vertices n, n+1, and n+2 define triangle n. For even n, vertices n+1, n, and n+2 define triangle n. N-2 triangles are drawn.
if (j % 2 == 0) {
Triangle3 tria(
Point3(v1.x, v1.y, z),
Point3(v2.x, v2.y, z),
Point3(v3.x, v3.y, z)
);
trias.push_back(tria);
} else {
Triangle3 tria(
Point3(v2.x, v2.y, z),
Point3(v1.x, v1.y, z),
Point3(v3.x, v3.y, z)
);
trias.push_back(tria);
}
TriangleStrip strip;
for (int j = 0; j < lst.num_vertices; ++j) {
gpc_vertex& v = lst.vertex[j];
strip.add(Point3(v.x, v.y, z));
}
strip.toTriangles(trias);
// for (int j = 2; j < lst.num_vertices; ++j) {
// gpc_vertex& v1 = lst.vertex[j - 2];
// gpc_vertex& v2 = lst.vertex[j - 1];
// gpc_vertex& v3 = lst.vertex[j];
// // https://en.wikipedia.org/wiki/Triangle_strip
// // GL_TRIANGLE_STRIP
// // Draws a series of triangles (three-sided polygons) using vertices v0, v1, v2, then v2, v1, v3 (note the order), then v2, v3, v4, and so on. The ordering is to ensure that the triangles are all drawn with the same orientation so that the strip can correctly form part of a surface.
// // For odd n, vertices n, n+1, and n+2 define triangle n. For even n, vertices n+1, n, and n+2 define triangle n. N-2 triangles are drawn.
// if (j % 2 == 0) {
// Triangle3 tria(
// Point3(v1.x, v1.y, z),
// Point3(v2.x, v2.y, z),
// Point3(v3.x, v3.y, z)
// );
// trias.push_back(tria);
// } else {
// Triangle3 tria(
// Point3(v2.x, v2.y, z),
// Point3(v1.x, v1.y, z),
// Point3(v3.x, v3.y, z)
// );
// trias.push_back(tria);
// }
//}
}