This commit is contained in:
2018-03-27 14:04:31 +02:00
parent d746a253be
commit 0b0db2b706
8 changed files with 109 additions and 99 deletions

View File

@@ -2,12 +2,12 @@
#define MV3DELEMENTFLOOROUTLINE_H
#include <Indoor/floorplan/v2/Floorplan.h>
#include <Indoor/wifi/estimate/ray3/ModelFactoryHelper.h>
#include "misc/Cube.h"
#include "MV3DElement.h"
#include "../../lib/gpc/gpc.h"
#include "misc/Polygon.h"
#include "misc/Outline.h"
class MV3DElementFloorOutline : public MV3DElement {
@@ -17,7 +17,7 @@ class MV3DElementFloorOutline : public MV3DElement {
struct Temp {
Point2 cacheSum;
Polygon* pol = nullptr;
Ray3D::Polygon* pol = nullptr;
std::vector<std::vector<Point3>> trias;
};
@@ -80,7 +80,7 @@ protected:
std::vector<gpc_polygon> add;
std::vector<gpc_polygon> rem;
if (tmp.pol) {delete tmp.pol;}
tmp.pol = new Polygon();
tmp.pol = new Ray3D::Polygon();
// all to-be-added polygons (filter!)
for (Floorplan::FloorOutlinePolygon* poly : polys) {