added objects

minor changes
This commit is contained in:
k-a-z-u
2018-04-03 16:13:44 +02:00
parent bb957e119a
commit c4b07dcee6
5 changed files with 341 additions and 5 deletions

View File

@@ -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");