FHWS/Indoor
Archived
4
0
Fork 0
Code Issues 19 Pull Requests Releases 1 Wiki Activity

worked on 3d models within map

Browse Source 
adjusted grid factory
adjusted nav mesh factory
minoor changes/fixes
new helper classes
refactoring
This commit is contained in:
FrankE
2018-04-03 14:55:59 +02:00
parent f3b6155157
commit 1c2081d406
25 changed files with 620 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grid/walk/v2/modules/WalkModuleFollowDestination.h
View File

@@ -42,6 +42,10 @@ public:
}
const Dijkstra<Node>& getDijkstra() const {
return dijkstra;
}
/** ctor WITH known destination*/
WalkModuleFollowDestination(const Grid<Node>& grid, const Node& destination) : grid(grid) {
setDestination(destination);

4
grid/walk/v3/ReachableSampler.h
View File

@@ -1,7 +1,7 @@
#ifndef INDOOR_GW3_REACHABLESAMPLER_H
#define INDOOR_GW3_REACHABLESAMPLER_H
#include "../../../math/Random.h"
#include "../../../math/random/RandomGenerator.h"
#include "Reachable.h"
#include "Helper.h"
@@ -27,7 +27,7 @@ namespace GW3 {
const std::vector<Entry>& reachableNodes;
mutable RandomGenerator gen;
mutable Random::RandomGenerator gen;
mutable std::uniform_real_distribution<float> dOffset;

4
grid/walk/v3/WalkEvaluator.h
View File

@@ -113,7 +113,9 @@ namespace GW3 {
public:
WalkEvalDistance(const Grid<Node>& grid, const double sigma = 0.1) : grid(grid), sigma(sigma), dist(0, sigma) {;}
WalkEvalDistance(const Grid<Node>& grid, const double sigma = 0.1) : grid(grid), sigma(sigma), dist(0, sigma) {
Assert::isFalse(grid.isEmpty(), "empty grid given");
}
virtual double getProbability(const PotentialWalk& walk) const override {

2
grid/walk/v3/Walker.h
View File

@@ -237,7 +237,7 @@ namespace GW3 {
Assert::isNot0(walkDist_m, "walking distance must be > 0");
const GridPoint gpStart = Helper::p3ToGp(params.start);
const GridPoint gpStart = grid.toGridPoint(params.start);
const Node* startNode = grid.getNodePtrFor(gpStart);
if (!startNode) {throw Exception("start node not found!");}