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

moved from ray3 to floorplan/3D

Browse Source 
worked on new wall models
refactoring
This commit is contained in:
FrankE
2018-07-24 08:13:16 +02:00
parent 083a1c2cf2
commit 8dd1ba0be6
25 changed files with 703 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
navMesh/NavMeshFactory.h
View File

@@ -8,7 +8,7 @@
#include "../geo/ConvexHull2.h"
#include "../geo/GPCPolygon2.h"
#include "../wifi/estimate/ray3/OBJPool.h"
#include "../floorplan/3D/objects/OBJPool.h"
#include "NavMesh.h"
#include "NavMeshTriangle.h"
@@ -632,7 +632,7 @@ namespace NM {
Floorplan::Polygon2 res;
// fetch object from pool
const Ray3D::Obstacle3D obs = Ray3D::OBJPool::get().getObject(obj->file).scaled(obj->scale).rotated_deg(obj->rot).translated(obj->pos);
const Floorplan3D::Obstacle3D obs = Floorplan3D::OBJPool::get().getObject(obj->file).scaled(obj->scale).rotated_deg(obj->rot).translated(obj->pos);
// construct 2D convex hull
res.points = ConvexHull2::get(obs.getPoints2D());