diff --git a/MainController.cpp b/MainController.cpp index d8b1a32..79d6221 100644 --- a/MainController.cpp +++ b/MainController.cpp @@ -125,7 +125,7 @@ MainController::MainController() { //mapModel->load("/apps/paper/diss/data/maps/walkmodel_stairs3.xml"); - mapModel->load("/apps/paper/maps/museum/map43_svg.xml"); + //mapModel->load("/apps/paper/maps/museum/map43_svg.xml"); //mapModel->load("/apps/paper/diss/data/maps/SHL41_nm.xml"); //mapModel->load("/mnt/sdcard/SHL41_nm.xml"); diff --git a/main.cpp b/main.cpp index 48d844e..03843d1 100644 --- a/main.cpp +++ b/main.cpp @@ -3,7 +3,7 @@ #include "MainController.h" #include -#include +//#include #include //#include "exp.h" //#include "ray.h" diff --git a/mapview/3D/grid/GridRenderer.cpp b/mapview/3D/grid/GridRenderer.cpp index cdb6dff..f0d124b 100644 --- a/mapview/3D/grid/GridRenderer.cpp +++ b/mapview/3D/grid/GridRenderer.cpp @@ -1,3 +1,5 @@ +#include "../../../fixC11.h" + #include "GridRenderer.h" #include @@ -58,7 +60,7 @@ void GridRenderer::rebuildIfNeeded(GridModel* model) { std::unordered_set used; for (MyNode& n1 : *grid) { - glColor3f(0.5, 0.5, 0.5); + //glColor3f(0.5, 0.5, 0.5); for (MyNode& n2 : grid->neighbors(n1)) { uint64_t min = std::min(n1.getIdx(), n2.getIdx()); uint64_t max = std::max(n1.getIdx(), n2.getIdx()); diff --git a/mapview/3D/navMesh/NavMeshRenderer.cpp b/mapview/3D/navMesh/NavMeshRenderer.cpp index a4aab44..880e062 100644 --- a/mapview/3D/navMesh/NavMeshRenderer.cpp +++ b/mapview/3D/navMesh/NavMeshRenderer.cpp @@ -1,3 +1,4 @@ +#include "../../../fixC11.h" #include "NavMeshRenderer.h" #include "NavMeshModel.h"