many changes :P

IndoorMap.pro

@@ -4,7 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += core gui opengl
+
+CONFIG += c++11
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg
 
@@ -14,8 +16,10 @@ TEMPLATE = app
 INCLUDEPATH += \
     ../
 
-SOURCES += main.cpp\
-        MainWindow.cpp \
+SOURCES += \
+	lib/gpc/gpc.cpp \
+	main.cpp \
+	MainWindow.cpp \
     MainController.cpp \
     mapview/tools/ToolSelector.cpp \
     mapview/tools/Tool.cpp \
@@ -25,7 +29,9 @@ SOURCES += main.cpp\
     params/ActionWidget.cpp \
     params/ToolBox.cpp \
     mapview/model/MapModel.cpp \
-    tree/MapTreeModel.cpp
+    tree/MapTreeModel.cpp \
+	mapview/3D/MapView3D.cpp
+
 
 HEADERS  += MainWindow.h \
     mapview/Painter.h \
@@ -74,16 +80,33 @@ HEADERS  += MainWindow.h \
     mapview/model/MMFloorBeacon.h \
     mapview/model/MMFloorAccessPoints.h \
     mapview/model/MMFloorBeacons.h \
-    mapview/model/MMFloorUnderlay.h \
     mapview/model/IHasFile.h \
     mapview/elements/MV2DElementFloorUnderlay.h \
     mapview/model/MMFloorUnderlayImage.h \
-    mapview/model/IHasParams.h
+    mapview/model/IHasParams.h \
+    mapview/model/MMFloorUnderlays.h \
+    mapview/elements/MV2DElementPOI.h \
+    mapview/model/MMFloorPOIs.h \
+    mapview/model/MMFloorPOI.h \
+    mapview/3D/MapView3D.h \
+    mapview/3D/MV3DElement.h \
+    mapview/3D/MV3DElementFloorObstacleWall.h \
+    mapview/3D/MV3DElementFloorObstaclePillar.h \
+    mapview/3D/MV3DElementAccessPoint.h \
+    mapview/3D/misc/Cube.h \
+    mapview/3D/MV3DElementFloorOutlinePolygon.h \
+    mapview/3D/MV3DElementFloorOutline.h \
+    mapview/3D/misc/Polygon.h \
+    mapview/grid/MapView3DGrid.h \
+    mapview/grid/MapModelGrid.h \
+	mapview/3DGrid/GridModel.h \
+    mapview/3DGrid/GridRenderer.h \
+    mapview/3DGrid/MyNode.h
 
 FORMS    += MainWindow.ui
 
 SOURCES += \
-   /apps/android/workspace/Indoor/lib/tinyxml/tinyxml2.cpp
+   ../Indoor/lib/tinyxml/tinyxml2.cpp
 
 RESOURCES += \
     res.qrc