Merge branch 'master' of https://git.frank-ebner.de/FHWS/Indoor

wifi/estimate/ray3/ModelFactory.h

@@ -3,7 +3,8 @@
 
 #include "../../../floorplan/v2/Floorplan.h"
 #include "../../../geo/Triangle3.h"
-#include "ModelFactoryHelper.h"
+#include "../../../geo/GPCPolygon2.h"
+
 #include "Obstacle3.h"
 #include "Cube.h"
 #include "Tube.h"
@@ -132,7 +133,7 @@ namespace Ray3D {
 
 			// process all "add" regions by type
 			// [this allows for overlaps of the same type]
-			std::unordered_map<std::string, Polygon> types;
+			std::unordered_map<std::string, GPCPolygon2> types;
 			for (Floorplan::FloorOutlinePolygon* fop : f->outline) {
 				if (fop->method == Floorplan::OutlineMethod::ADD) {
 					if (fop->outdoor) {

wifi/estimate/ray3/ModelFactoryHelper.h

@@ -1,109 +0,0 @@
-#ifndef MODELFACTORYHELPER_H
-#define MODELFACTORYHELPER_H
-
-#include <Indoor/floorplan/v2/Floorplan.h>
-#include "../../../lib/gpc/gpc.h"
-
-namespace Ray3D {
-
-	class Polygon {
-
-		struct GPCPolygon : gpc_polygon {
-			GPCPolygon() {
-				num_contours = 0;
-				contour = nullptr;
-				hole = nullptr;
-			}
-			~GPCPolygon() {
-				if (contour) {
-					gpc_free_polygon(this);
-					//free(contour->vertex); contour->vertex = nullptr;
-				}
-				free(contour); contour = nullptr;
-				free(hole); hole = nullptr;
-
-			}
-			GPCPolygon& operator = (const GPCPolygon& o) = delete;
-			GPCPolygon& operator = (GPCPolygon& o) {
-				this->contour = o.contour;
-				this->hole = o.hole;
-				this->num_contours = o.num_contours;
-				o.contour = nullptr;
-				o.hole = nullptr;
-				return *this;
-			}
-		};
-
-	private:
-
-		GPCPolygon state;
-
-	public:
-
-		void add(const Floorplan::Polygon2& poly) {
-			GPCPolygon cur = toGPC(poly);
-			//GPCPolygon out;
-			gpc_polygon_clip(GPC_UNION, &state, &cur, &state);
-			//state = out;
-		}
-
-		void remove(const Floorplan::Polygon2& poly) {
-			GPCPolygon cur = toGPC(poly);
-			//GPCPolygon out;
-			gpc_polygon_clip(GPC_DIFF, &state, &cur, &state);
-			//state = out;
-		}
-
-		std::vector<std::vector<Point3>> get(float z) {
-
-			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<std::vector<Point3>> trias;
-
-			for (int i = 0; i < res.num_strips; ++i) {
-				gpc_vertex_list lst = res.strip[i];
-				std::vector<Point3> tria;
-				for (int j = 0; j < lst.num_vertices; ++j) {
-					gpc_vertex& vert = lst.vertex[j];
-					Point3 p3(vert.x, vert.y, z);
-					tria.push_back(p3);
-				}
-				trias.push_back(tria);
-			}
-
-			gpc_free_tristrip(&res);
-
-			return std::move(trias);
-
-		}
-
-	private:
-
-		GPCPolygon toGPC(Floorplan::Polygon2 poly) {
-
-			std::vector<gpc_vertex> verts;
-			for (Point2 p2 : poly.points) {
-				gpc_vertex vert; vert.x = p2.x; vert.y = p2.y;
-				verts.push_back(vert);
-			}
-
-			GPCPolygon gpol;
-			gpc_vertex_list list;
-			list.num_vertices = verts.size();
-			list.vertex = verts.data();
-			gpc_add_contour(&gpol, &list, 0);
-
-			return gpol;
-
-		}
-
-	};
-
-}
-
-#endif // MODELFACTORYHELPER_H

wifi/estimate/ray3/OBJPool.h

@@ -57,7 +57,6 @@ namespace Ray3D {
 					scanFolder(folder);
 				} catch (...) {;}
 			}
-			initDone = true;
 
 		}
 
@@ -89,9 +88,9 @@ namespace Ray3D {
 			}
 
 			for (std::experimental::filesystem::directory_entry entry : std::experimental::filesystem::directory_iterator(d)) {
-				const std::string absFile = entry.path().native();
+				const std::string absFile = entry.path().string();
 				if (endsWith(absFile, ".obj")) {
-					std::string name = entry.path().filename();
+					std::string name = entry.path().filename().string();
 					name = name.substr(0, name.length() - 4);	// without extension
 					load(absFile, name);
 				}

wifi/estimate/ray3/OBJReader.h

@@ -27,7 +27,7 @@ public:
 	/** one triangle */
 	struct Face {
 		VNT vnt[3];
-		Face(VNT v1, VNT v2, VNT v3) : vnt({v1,v2,v3}) {;}
+		Face(VNT v1, VNT v2, VNT v3) : vnt{v1,v2,v3} {;}
 	};
 
 	/** one object within the file */