FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

added c++11 fixes for android

Browse Source
This commit is contained in:
k-a-z-u
2018-07-11 12:29:32 +02:00
parent ba9c8359d7
commit 7ee4e122e8
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainController.cpp
View File

@@ -125,7 +125,7 @@ MainController::MainController() {
//mapModel->load("/apps/paper/diss/data/maps/walkmodel_stairs3.xml"); //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("/apps/paper/diss/data/maps/SHL41_nm.xml");
//mapModel->load("/mnt/sdcard/SHL41_nm.xml"); //mapModel->load("/mnt/sdcard/SHL41_nm.xml");

2
main.cpp
View File

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

4
mapview/3D/grid/GridRenderer.cpp
View File

@@ -1,3 +1,5 @@
#include "../../../fixC11.h"
#include "GridRenderer.h" #include "GridRenderer.h"
#include <QOpenGLWidget> #include <QOpenGLWidget>
@@ -58,7 +60,7 @@ void GridRenderer::rebuildIfNeeded(GridModel* model) {
std::unordered_set<uint64_t> used; std::unordered_set<uint64_t> used;
for (MyNode& n1 : *grid) { for (MyNode& n1 : *grid) {
glColor3f(0.5, 0.5, 0.5); //glColor3f(0.5, 0.5, 0.5);
for (MyNode& n2 : grid->neighbors(n1)) { for (MyNode& n2 : grid->neighbors(n1)) {
uint64_t min = std::min(n1.getIdx(), n2.getIdx()); uint64_t min = std::min(n1.getIdx(), n2.getIdx());
uint64_t max = std::max(n1.getIdx(), n2.getIdx()); uint64_t max = std::max(n1.getIdx(), n2.getIdx());

1
mapview/3D/navMesh/NavMeshRenderer.cpp
View File

@@ -1,3 +1,4 @@
#include "../../../fixC11.h"
#include "NavMeshRenderer.h" #include "NavMeshRenderer.h"
#include "NavMeshModel.h" #include "NavMeshModel.h"