FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Removed duplicated code regarding GPCPoly

Browse Source
This commit is contained in:
Markus Bullmann
2018-04-04 09:40:39 +02:00
parent cc997bc3f0
commit e02c294ff6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mapview/3D/MV3DElementFloorOutline.h
View File

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