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

worked on mapview 3d stuff

Browse Source
This commit is contained in:
FrankE
2018-07-24 10:26:27 +02:00
parent 423fbfc545
commit 4938987063
7 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mapview/2D/MV2DElementFloorObstacleObject.cpp
View File

@@ -2,7 +2,7 @@
#include "MapViewElementHelper.h"
#include <Indoor/floorplan/v2/Floorplan.h>
#include <Indoor/wifi/estimate/ray3/OBJPool.h>
#include <Indoor/floorplan/3D/objects/OBJPool.h>
#include "../../UIHelper.h"
@@ -70,7 +70,7 @@ void MV2DElementFloorObstacleObject::paint(Painter& p) {
// for (const Cache::Line& l : e.lines) {
// p.drawLine(l.p1, l.p2);
// }
const Ray3D::Obstacle3D obs = Ray3D::OBJPool::get().getObject(fo->file).rotated_deg(fo->rot).translated(fo->pos);
const Floorplan3D::Obstacle3D obs = Floorplan3D::OBJPool::get().getObject(fo->file).rotated_deg(fo->rot).translated(fo->pos);
for (const Triangle3& tria : obs.triangles) {
if (tria.p1.xy() != tria.p2.xy()) {
p.drawLine( tria.p1.xy(), tria.p2.xy() );