started working on walling, dooring and windowing

refactoring

wifi/estimate/ray3/WifiRayTrace3D.h

@@ -14,8 +14,8 @@
 #include "DataMap3.h"
 #include "../../../geo/Ray3.h"
 #include "MaterialOptions.h"
-#include "Obstacle3.h"
-#include "ModelFactory.h"
+#include "../../../floorplan/3D/Obstacle3.h"
+#include "../../../floorplan/3D/Builder.h"
 //#include "ObstacleTree.h"
 
 
@@ -33,6 +33,7 @@
 // 3D
 // http://graphics.stanford.edu/courses/cs148-10-summer/docs/2006--degreve--reflection_refraction.pdf
 
+using namespace Floorplan3D;
 
 namespace Ray3D {
 
@@ -199,7 +200,7 @@ namespace Ray3D {
 			// allocate
 			dm.resize(bbox, gs);
 
-			ModelFactory fac(map);
+			Builder fac(map);
 			std::vector<Obstacle3D> obstacles = fac.getMesh().elements;
 
 			// build bounding volumes