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
grid/factory/v2/GridFactory.h
View File

@@ -21,7 +21,7 @@
#include "../../../misc/Debug.h"
#include <functional>
#include "../../../wifi/estimate/ray3/OBJPool.h"
#include "../../../floorplan/3D/objects/OBJPool.h"
#include "../../../geo/ConvexHull2.h"
#include "GridFactoryListener.h"
@@ -224,7 +224,7 @@ public:
if (foo) {
// get the obstacle
const Ray3D::Obstacle3D obs = Ray3D::OBJPool::get().getObject(foo->file).scaled(foo->scale).rotated_deg(foo->rot).translated(foo->pos);
const Floorplan3D::Obstacle3D obs = Floorplan3D::OBJPool::get().getObject(foo->file).scaled(foo->scale).rotated_deg(foo->rot).translated(foo->pos);
// construct its 2D convex hull (in centimter)
HelperPoly poly;