From 8a08ae32d8612ebea18084229ceeeebec32b5e3e Mon Sep 17 00:00:00 2001 From: kazu Date: Wed, 6 Jun 2018 08:56:58 +0200 Subject: [PATCH] minor changes --- walky/ParticleWalkNavMesh.h | 12 +++++++----- walky/ProbViz.h | 2 +- walky/file.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/walky/ParticleWalkNavMesh.h b/walky/ParticleWalkNavMesh.h index e3c3bc6..273bdea 100644 --- a/walky/ParticleWalkNavMesh.h +++ b/walky/ParticleWalkNavMesh.h @@ -4,6 +4,8 @@ #include "file.h" +#include + #include #include #include @@ -12,7 +14,7 @@ #include #include -#include +//#include #include #include #include @@ -200,8 +202,8 @@ public: // Offline::FileReader reader(File::getData("/walks/walk_in_circles_around_hole.csv")); //const Point3 startP3 = Point3(0,0,0); // const float startHead = 0; - Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(File::getData("/walks/walk_stair_down_and_up_again_map_b.xml"));const Point3 startP3 = Point3(0,0,6); - Offline::FileReader reader(File::getData("/walks/walk_stair_down_and_up_again.csv")); + Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(File::getData("walk_stair_down_and_up_again_map_b.xml"));const Point3 startP3 = Point3(0,0,6); + Offline::FileReader reader(File::getData("walk_stair_down_and_up_again.csv")); const float startHead = 0; Offline::FilePlayer player(&reader, &test); @@ -223,7 +225,7 @@ public: vizNM.addMesh(mesh); -#define WALK_MODE 4 +#define WALK_MODE 1 //#define WALK_USE_MANY #if (WALK_MODE==1) @@ -432,7 +434,7 @@ public: PERF_DUMP(); - //std::this_thread::sleep_for(std::chrono::milliseconds(50)); + std::this_thread::sleep_for(std::chrono::milliseconds(35)); } diff --git a/walky/ProbViz.h b/walky/ProbViz.h index 4ce44a5..99bbb0d 100644 --- a/walky/ProbViz.h +++ b/walky/ProbViz.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include class ProbViz { diff --git a/walky/file.h b/walky/file.h index 12bed5b..f7de6b8 100644 --- a/walky/file.h +++ b/walky/file.h @@ -5,10 +5,10 @@ namespace File { - const std::string basePath = "/apps/paper/diss/code/walkModel/"; + const std::string basePath = "/apps/paper/DSem1/walky/"; //const std::string basePath = "/mnt/vm/paper/diss/code/walkModel/"; - const std::string dataPath = "/apps/paper/diss/data/"; + const std::string dataPath = "/apps/paper/DSem1/walky/"; //const std::string dataPath = "/mnt/vm/paper/diss/data"; static inline std::string get(const std::string& name) {