changes to Floorplan 3D

floorplan/3D/Builder.h

@@ -11,6 +11,7 @@
 #include "Handrails.h"
 #include "Objects.h"
 #include "Pillars.h"
+#include "Doors.h"
 
 #include "Walls.h"
 #include "WallsViaCubes.h"
@@ -102,6 +103,8 @@ namespace Floorplan3D {
 						res.insert(res.end(), tmp.begin(), tmp.end());
 					}
 
+
+
 					if (exportHandrails) {
 						Handrails rails;
 						const std::vector<Obstacle3D> tmp = rails.getHandrails(f);
@@ -120,6 +123,12 @@ namespace Floorplan3D {
 						res.insert(res.end(), tmp.begin(), tmp.end());
 					}
 
+					if (exportDoors) {
+						Doors doors;
+						const std::vector<Obstacle3D> tmp = doors.getDoors(f);
+						res.insert(res.end(), tmp.begin(), tmp.end());
+					}
+
 //					for (const Floorplan::FloorObstacle* fo : f->obstacles) {
 //						std::vector<Obstacle3D> tmp = getWalls(f);
 //						res.insert(res.end(), tmp.begin(), tmp.end());
@@ -161,7 +170,11 @@ namespace Floorplan3D {
 
 			for (const Floorplan::FloorObstacle* obs : f->obstacles) {
 				const Floorplan::FloorObstacleLine* line = dynamic_cast<const Floorplan::FloorObstacleLine*>(obs);
-				if (line) {walls.add(f, line, nullptr);}
+				if (line) {
+					if (line->type == Floorplan::ObstacleType::WALL) {
+						walls.add(f, line, nullptr);
+					}
+				}
 			}
 
 			return walls.get();