worked on mapview 3d stuff

This commit is contained in:
2018-07-24 10:26:27 +02:00
parent 423fbfc545
commit 4938987063
7 changed files with 24 additions and 22 deletions

View File

@@ -2,7 +2,7 @@
#define FLOORPLANRENDERERMODEL_H
#include <Indoor/floorplan/v2/Floorplan.h>
#include <Indoor/wifi/estimate/ray3/FloorplanMesh.h>
#include <Indoor/floorplan/3D/FloorplanMesh.h>
#include "RenderTriangle.h"
@@ -14,12 +14,12 @@ class FloorplanRendererModel {
private:
Floorplan::IndoorMap* im;
Ray3D::FloorplanMesh mesh;
Floorplan3D::FloorplanMesh mesh;
RenderTriangle triaSolid;
RenderTriangle triaTransp;
int getMaterial(const Ray3D::Obstacle3D& o) const;
int getMaterial(const Floorplan3D::Obstacle3D& o) const;
public:
@@ -29,7 +29,7 @@ public:
/** ctor */
FloorplanRendererModel();
Ray3D::FloorplanMesh& getMesh();
Floorplan3D::FloorplanMesh& getMesh();
const RenderTriangle& getTriaSolid();