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

fixed merge issue...

Browse Source
This commit is contained in:
FrankE
2018-05-12 11:11:39 +02:00
parent 5db13eb493
commit 1bc95d9c55
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mapview/3D/floorplan/FloorplanRendererModel.h
View File

@@ -89,20 +89,19 @@ public:
void rebuild(Floorplan::IndoorMap* im) { void rebuild(Floorplan::IndoorMap* im) {
<<<<<<< HEAD
// rebuild the mesh // rebuild the mesh
Ray3D::ModelFactory fac(im); //Ray3D::ModelFactory fac(im);
fac.exportDoors = showDoors;
mesh = fac.getMesh(); //mesh = fac.getMesh();
=======
>>>>>>> 45592899ee7de1a99f3086205788ff43398fad41
triaTransp.clear(); triaTransp.clear();
triaSolid.clear(); triaSolid.clear();
// rebuild the mesh // rebuild the mesh
try { try {
Ray3D::ModelFactory fac(im); Ray3D::ModelFactory fac(im);
fac.exportDoors = showDoors;
mesh = fac.getMesh(); mesh = fac.getMesh();
for (const Ray3D::Obstacle3D& obs : mesh.elements) { for (const Ray3D::Obstacle3D& obs : mesh.elements) {
const int matID = getMaterial(obs); const int matID = getMaterial(obs);