worked on 3D walls

geo/GPCPolygon2.h

@@ -2,6 +2,8 @@
 #define GPCPOLYGON2_H
 
 #include "../lib/gpc/gpc.cpp.h"
+#include "Polygon2.h"
+#include "Triangle3.h"
 
 class GPCPolygon2 {
 
@@ -44,6 +46,11 @@ public:
 		;
 	}
 
+	void add(const Polygon2& poly) {
+		GPCPolygon cur;
+		toGPC(poly, cur);
+		gpc_polygon_clip(GPC_UNION, &state, &cur, &state);
+	}
 	void add(const Floorplan::Polygon2& poly) {
 		GPCPolygon cur;
 		toGPC(poly, cur);
@@ -55,6 +62,11 @@ public:
 		toGPC(poly, cur);
 		gpc_polygon_clip(GPC_DIFF, &state, &cur, &state);
 	}
+	void remove(const Polygon2& poly) {
+		GPCPolygon cur;
+		toGPC(poly, cur);
+		gpc_polygon_clip(GPC_DIFF, &state, &cur, &state);
+	}
 
 	std::vector<std::vector<Point3>> get() {
 
@@ -88,6 +100,57 @@ public:
 
 	}
 
+	std::vector<Triangle3> getTriangles() {
+
+		gpc_tristrip res;
+		res.num_strips = 0;
+		res.strip = nullptr;
+
+		//res.strip = (gpc_vertex_list*) malloc(1024);
+		gpc_polygon_to_tristrip(&state, &res);
+
+		std::vector<Triangle3> trias;
+
+		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);
+				}
+
+
+			}
+
+		}
+
+		gpc_free_tristrip(&res);
+
+		return std::move(trias);
+
+	}
+
 	std::vector<std::vector<Point3>> get(float z) {
 
 		gpc_tristrip res;
@@ -118,7 +181,7 @@ public:
 
 private:
 
-	void toGPC(Floorplan::Polygon2 poly, GPCPolygon& result) {
+	void toGPC(const Floorplan::Polygon2& poly, GPCPolygon& result) {
 
 		std::vector<gpc_vertex> verts;
 		for (Point2 p2 : poly.points) {
@@ -133,5 +196,20 @@ private:
 
 	}
 
+	void toGPC(const Polygon2& poly, GPCPolygon& result) {
+
+		std::vector<gpc_vertex> verts;
+		for (Point2 p2 : poly) {
+			gpc_vertex vert; vert.x = p2.x; vert.y = p2.y;
+			verts.push_back(vert);
+		}
+
+		gpc_vertex_list list;
+		list.num_vertices = verts.size();
+		list.vertex = verts.data();
+		gpc_add_contour(&result, &list, 0);
+
+	}
+
 };
 #endif

geo/Line2.h

@@ -232,7 +232,7 @@ public:
 };
 
 
-static inline bool intersects(const Line2& l1, const Line2& l2, bool limit, Point2& pos) {
+static inline bool intersects(const Line2& l1, const Line2& l2, bool limit, Point2& pos, float* _u = nullptr) {
 
 	// (sx1,sy1) + (dx1, dy1)*u  =  (sx2, sy2) + (dx2, dy2)*v
 	// solve((c+d*v-a)/b = (g+h*v-e)/f, v)
@@ -269,6 +269,7 @@ static inline bool intersects(const Line2& l1, const Line2& l2, bool limit, Poin
 
 	if (!limit || (u >= 0 && v >= 0 && u <= 1 && v <= 1)) {
 		pos = Point2(x,y);
+		if (_u) {*_u = u;}
 		return true;
 	}
 
@@ -277,4 +278,6 @@ static inline bool intersects(const Line2& l1, const Line2& l2, bool limit, Poin
 }
 
 
+
+
 #endif // LINE2D_H

geo/Point2.h

@@ -85,6 +85,7 @@ inline void swap(Point2& p1, Point2& p2) {
 }
 
 namespace std {
+
     template <> struct hash<Point2> {
 	    std::size_t operator()(const Point2& p) const {
 			uint32_t x = *((uint32_t*)&(p.x));
@@ -92,6 +93,7 @@ namespace std {
 			return std::hash<uint32_t>()(x^y);
 		}
     };
+
 }
 
 #endif // POINT2_H

geo/Point3.h

@@ -59,6 +59,7 @@ template <typename Scalar> struct _Point3 {
 
 
 	Point2 xy() const {return Point2(x,y);}
+	Point2 xz() const {return Point2(x,z);}
 
 
 	_Point3 rotX(const Scalar r) const {

geo/Polygon2.h

@@ -18,6 +18,10 @@ public:
 		pts.push_back(p);
 	}
 
+	void add(std::initializer_list<Point2> lst) {
+		for (const Point2 p : lst) {add(p);}
+	}
+
 	std::vector<Point2>::iterator begin() {return pts.begin();}
 	std::vector<Point2>::iterator end() {return pts.end();}