added objects

minor changes

IndoorMap.pro

@@ -6,7 +6,8 @@
 
 QT       += core gui opengl
 
-CONFIG += c++11 -g3 -O0
+CONFIG += c++17 -g3 -O0
+LIBS += -lstdc++fs
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg
 
@@ -16,13 +17,13 @@ TEMPLATE = app
 DEFINES += WITH_ASSERTIONS
 DEFINES += WITH_DEBUG_LOG
 
+
 INCLUDEPATH += \
 	../
 
 
 
 SOURCES += \
-	lib/gpc/gpc.cpp \
 	main.cpp \
 	MainWindow.cpp \
 	MainController.cpp \
@@ -172,7 +173,7 @@ HEADERS  += MainWindow.h \
     mapview/3D/grid/GridModel.h \
     mapview/3D/grid/GridRenderer.h \
     mapview/3D/grid/MyNode.h \
-    mapview/3D/navMesh/NavMeshModel.h \
+	mapview/3D/navMesh/NavMeshModel.h \
     mapview/3D/navMesh/NavMeshRenderer.h \
     mapview/3D/navMesh/QNavMeshSettings.h \
     mapview/3D/misc/TriangleData.h \

MainController.cpp

@@ -103,7 +103,12 @@ MainController::MainController() {
 	connect(mw, &MainWindow::onGridNodeColorType, [&] () {mw->getMapView3D()->getGridRenderer()->setNodeColorMode(GridRendererColorMode::SHOW_NODE_TYPE);} );
 	connect(mw, &MainWindow::onGridShowEdges, [&] (const bool show) {mw->getMapView3D()->getGridRenderer()->setShowEdges(show);} );
 
-	Ray3D::OBJPool::get().init("/mnt/vm/paper/diss/code/IndoorMap/res/mdl/");
+	//Ray3D::OBJPool::get().init("/mnt/vm/paper/diss/code/IndoorMap/res/mdl/");
+	//Ray3D::OBJPool::get().init("/apps/paper/diss/code/IndoorMap/res/mdl/");
+	Ray3D::OBJPool::get().init({
+		"/mnt/vm/paper/diss/code/IndoorMap/res/mdl/",
+		"/apps/paper/diss/code/IndoorMap/res/mdl/",
+	});
 
 	//mapModel->load("../IndoorMap/maps/SHL36_noel.xml");
 	//mapModel->load("../IndoorMap/maps/SHL38_no_elev.xml");
@@ -113,7 +118,7 @@ MainController::MainController() {
 
 	//mapModel->load("/mnt/vm/paper/diss/data/maps/test_in_out_overlap.xml");
 
-	mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml");
+	//mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml");
 	//mapModel->load("/mnt/vm/paper/diss/data/maps/SHL42_nm.xml");
 	//mapModel->load("/apps/paper/diss/data/maps/SHL41_nm.xml");
 

main.cpp

@@ -3,6 +3,8 @@
 #include "MainController.h"
 #include <QApplication>
 
+#include <experimental/filesystem>
+#include <iostream>
 //#include "exp.h"
 //#include "ray.h"
 

res/mdl/dude1.obj

@@ -0,0 +1,164 @@
+# Blender v2.79 (sub 0) OBJ File: 'dude1.blend'
+# www.blender.org
+v 0.050000 0.225000 0.750000
+v 0.050000 0.225000 1.450000
+v -0.050000 0.225000 0.750000
+v -0.050000 0.225000 1.450000
+v 0.050000 0.325000 0.750000
+v 0.050000 0.325000 1.450000
+v -0.050000 0.325000 0.750000
+v -0.050000 0.325000 1.450000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 2//1 3//1 1//1
+f 4//2 7//2 3//2
+f 8//3 5//3 7//3
+f 6//4 1//4 5//4
+f 7//5 1//5 3//5
+f 4//6 6//6 8//6
+f 2//1 4//1 3//1
+f 4//2 8//2 7//2
+f 8//3 6//3 5//3
+f 6//4 2//4 1//4
+f 7//5 5//5 1//5
+f 4//6 2//6 6//6
+v 0.050000 -0.325000 0.750000
+v 0.050000 -0.325000 1.450000
+v -0.050000 -0.325000 0.750000
+v -0.050000 -0.325000 1.450000
+v 0.050000 -0.225000 0.750000
+v 0.050000 -0.225000 1.450000
+v -0.050000 -0.225000 0.750000
+v -0.050000 -0.225000 1.450000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 10//7 11//7 9//7
+f 12//8 15//8 11//8
+f 16//9 13//9 15//9
+f 14//10 9//10 13//10
+f 15//11 9//11 11//11
+f 12//12 14//12 16//12
+f 10//7 12//7 11//7
+f 12//8 16//8 15//8
+f 16//9 14//9 13//9
+f 14//10 10//10 9//10
+f 15//11 13//11 9//11
+f 12//12 10//12 14//12
+v 0.100000 -0.100000 1.550000
+v 0.100000 -0.100000 1.750000
+v -0.100000 -0.100000 1.550000
+v -0.100000 -0.100000 1.750000
+v 0.100000 0.100000 1.550000
+v 0.100000 0.100000 1.750000
+v -0.100000 0.100000 1.550000
+v -0.100000 0.100000 1.750000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 18//13 19//13 17//13
+f 20//14 23//14 19//14
+f 24//15 21//15 23//15
+f 22//16 17//16 21//16
+f 23//17 17//17 19//17
+f 20//18 22//18 24//18
+f 18//13 20//13 19//13
+f 20//14 24//14 23//14
+f 24//15 22//15 21//15
+f 22//16 18//16 17//16
+f 23//17 21//17 17//17
+f 20//18 18//18 22//18
+v 0.150000 -0.200000 0.900000
+v 0.150000 -0.200000 1.500000
+v -0.150000 -0.200000 0.900000
+v -0.150000 -0.200000 1.500000
+v 0.150000 0.200000 0.900000
+v 0.150000 0.200000 1.500000
+v -0.150000 0.200000 0.900000
+v -0.150000 0.200000 1.500000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 26//19 27//19 25//19
+f 28//20 31//20 27//20
+f 32//21 29//21 31//21
+f 30//22 25//22 29//22
+f 31//23 25//23 27//23
+f 28//24 30//24 32//24
+f 26//19 28//19 27//19
+f 28//20 32//20 31//20
+f 32//21 30//21 29//21
+f 30//22 26//22 25//22
+f 31//23 29//23 25//23
+f 28//24 26//24 30//24
+v 0.075000 0.025000 0.000000
+v 0.075000 0.025000 0.850000
+v -0.075000 0.025000 0.000000
+v -0.075000 0.025000 0.850000
+v 0.075000 0.175000 0.000000
+v 0.075000 0.175000 0.850000
+v -0.075000 0.175000 0.000000
+v -0.075000 0.175000 0.850000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 34//25 35//25 33//25
+f 36//26 39//26 35//26
+f 40//27 37//27 39//27
+f 38//28 33//28 37//28
+f 39//29 33//29 35//29
+f 36//30 38//30 40//30
+f 34//25 36//25 35//25
+f 36//26 40//26 39//26
+f 40//27 38//27 37//27
+f 38//28 34//28 33//28
+f 39//29 37//29 33//29
+f 36//30 34//30 38//30
+v 0.075000 -0.175000 0.000000
+v 0.075000 -0.175000 0.850000
+v -0.075000 -0.175000 0.000000
+v -0.075000 -0.175000 0.850000
+v 0.075000 -0.025000 0.000000
+v 0.075000 -0.025000 0.850000
+v -0.075000 -0.025000 0.000000
+v -0.075000 -0.025000 0.850000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 42//31 43//31 41//31
+f 44//32 47//32 43//32
+f 48//33 45//33 47//33
+f 46//34 41//34 45//34
+f 47//35 41//35 43//35
+f 44//36 46//36 48//36
+f 42//31 44//31 43//31
+f 44//32 48//32 47//32
+f 48//33 46//33 45//33
+f 46//34 42//34 41//34
+f 47//35 45//35 41//35
+f 44//36 42//36 46//36

res/mdl/dude2.obj

@@ -0,0 +1,164 @@
+# Blender v2.79 (sub 0) OBJ File: 'dude2.blend'
+# www.blender.org
+v -0.255778 0.216248 0.761661
+v 0.038929 0.242032 1.396077
+v -0.346064 0.208349 0.803923
+v -0.051357 0.234133 1.438339
+v -0.264493 0.315867 0.761661
+v 0.030214 0.341651 1.396077
+v -0.354779 0.307968 0.803923
+v -0.060072 0.333752 1.438339
+vn 0.0872 -0.9962 -0.0000
+vn -0.9029 -0.0790 0.4226
+vn -0.0872 0.9962 0.0000
+vn 0.9029 0.0790 -0.4226
+vn -0.4210 -0.0368 -0.9063
+vn 0.4210 0.0368 0.9063
+s off
+f 2//1 3//1 1//1
+f 4//2 7//2 3//2
+f 7//3 6//3 5//3
+f 6//4 1//4 5//4
+f 7//5 1//5 3//5
+f 4//6 6//6 8//6
+f 2//1 4//1 3//1
+f 4//2 8//2 7//2
+f 7//3 8//3 6//3
+f 6//4 2//4 1//4
+f 7//5 5//5 1//5
+f 4//6 2//6 6//6
+v 0.357916 -0.307968 0.803923
+v 0.063209 -0.333752 1.438339
+v 0.267630 -0.315867 0.761661
+v -0.027077 -0.341651 1.396077
+v 0.349200 -0.208349 0.803923
+v 0.054493 -0.234133 1.438339
+v 0.258915 -0.216248 0.761661
+v -0.035792 -0.242032 1.396077
+vn 0.0872 -0.9962 -0.0000
+vn -0.9029 -0.0790 -0.4226
+vn -0.0872 0.9962 0.0000
+vn 0.9029 0.0790 0.4226
+vn 0.4210 0.0368 -0.9063
+vn -0.4210 -0.0368 0.9063
+s off
+f 10//7 11//7 9//7
+f 12//8 15//8 11//8
+f 15//9 14//9 13//9
+f 14//10 9//10 13//10
+f 15//11 9//11 11//11
+f 16//12 10//12 14//12
+f 10//7 12//7 11//7
+f 12//8 16//8 15//8
+f 15//9 16//9 14//9
+f 14//10 10//10 9//10
+f 15//11 13//11 9//11
+f 16//12 12//12 10//12
+v 0.100000 -0.100000 1.550000
+v 0.100000 -0.100000 1.750000
+v -0.100000 -0.100000 1.550000
+v -0.100000 -0.100000 1.750000
+v 0.100000 0.100000 1.550000
+v 0.100000 0.100000 1.750000
+v -0.100000 0.100000 1.550000
+v -0.100000 0.100000 1.750000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
+s off
+f 18//13 19//13 17//13
+f 20//14 23//14 19//14
+f 24//15 21//15 23//15
+f 22//16 17//16 21//16
+f 23//17 17//17 19//17
+f 20//18 22//18 24//18
+f 18//13 20//13 19//13
+f 20//14 24//14 23//14
+f 24//15 22//15 21//15
+f 22//16 18//16 17//16
+f 23//17 21//17 17//17
+f 20//18 18//18 22//18
+v 0.166860 -0.186166 0.900000
+v 0.166860 -0.186166 1.500000
+v -0.131998 -0.212312 0.900000
+v -0.131998 -0.212312 1.500000
+v 0.131998 0.212312 0.900000
+v 0.131998 0.212312 1.500000
+v -0.166860 0.186166 0.900000
+v -0.166860 0.186166 1.500000
+vn 0.0872 -0.9962 0.0000
+vn -0.9962 -0.0872 0.0000
+vn -0.0872 0.9962 0.0000
+vn 0.9962 0.0872 0.0000
+vn -0.0000 0.0000 -1.0000
+vn -0.0000 0.0000 1.0000
+s off
+f 26//19 27//19 25//19
+f 28//20 31//20 27//20
+f 32//21 29//21 31//21
+f 30//22 25//22 29//22
+f 31//23 25//23 27//23
+f 28//24 30//24 32//24
+f 26//19 28//19 27//19
+f 28//20 32//20 31//20
+f 32//21 30//21 29//21
+f 30//22 26//22 25//22
+f 31//23 29//23 25//23
+f 28//24 26//24 30//24
+v 0.210243 0.025000 0.019480
+v 0.062642 0.025000 0.856567
+v 0.062522 0.025000 -0.006567
+v -0.085079 0.025000 0.830520
+v 0.210243 0.175000 0.019480
+v 0.062642 0.175000 0.856567
+v 0.062522 0.175000 -0.006567
+v -0.085079 0.175000 0.830520
+vn 0.0000 -1.0000 0.0000
+vn -0.9848 0.0000 -0.1736
+vn 0.0000 1.0000 0.0000
+vn 0.9848 0.0000 0.1736
+vn 0.1736 0.0000 -0.9848
+vn -0.1736 0.0000 0.9848
+s off
+f 34//25 35//25 33//25
+f 36//26 39//26 35//26
+f 40//27 37//27 39//27
+f 38//28 33//28 37//28
+f 39//29 33//29 35//29
+f 36//30 38//30 40//30
+f 34//25 36//25 35//25
+f 36//26 40//26 39//26
+f 40//27 38//27 37//27
+f 38//28 34//28 33//28
+f 39//29 37//29 33//29
+f 36//30 34//30 38//30
+v -0.075060 -0.175000 -0.006567
+v 0.072541 -0.175000 0.830520
+v -0.222781 -0.175000 0.019480
+v -0.075180 -0.175000 0.856567
+v -0.075060 -0.025000 -0.006567
+v 0.072541 -0.025000 0.830520
+v -0.222781 -0.025000 0.019480
+v -0.075180 -0.025000 0.856567
+vn 0.0000 -1.0000 0.0000
+vn -0.9848 0.0000 0.1736
+vn 0.0000 1.0000 0.0000
+vn 0.9848 0.0000 -0.1736
+vn -0.1736 0.0000 -0.9848
+vn 0.1736 0.0000 0.9848
+s off
+f 42//31 43//31 41//31
+f 44//32 47//32 43//32
+f 48//33 45//33 47//33
+f 46//34 41//34 45//34
+f 47//35 41//35 43//35
+f 44//36 46//36 48//36
+f 42//31 44//31 43//31
+f 44//32 48//32 47//32
+f 48//33 46//33 45//33
+f 46//34 42//34 41//34
+f 47//35 45//35 41//35
+f 44//36 42//36 46//36