FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

refactoring to add nav mesh

Browse Source
This commit is contained in:
k-a-z-u
2018-07-11 19:04:42 +02:00
parent bb974d3871
commit b4a1a3d969
27 changed files with 1581 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/map/2D/ColorPoints2D.h
View File

@@ -8,8 +8,8 @@
#include <Indoor/grid/Grid.h>
#include <KLib/math/filter/particles/Particle.h>
#include "../nav/Node.h"
#include "../nav/State.h"
#include "../nav/grid/Node.h"
#include "../nav/Observation.h"
/**
* debug color points

2
ui/map/2D/MapView2D.cpp
View File

@@ -111,7 +111,7 @@ void MapView2D::setMap(WiFiCalibrationDataModel* mdl, Floorplan::IndoorMap* map)
}
void MapView2D::showParticles(const std::vector<K::Particle<MyState>>* particles) {
void MapView2D::showParticles(const std::vector<K::Particle<GridBased::MyState>>* particles) {
this->colorPoints->setFromParticles(*particles);
}

6
ui/map/2D/MapView2D.h
View File

@@ -12,6 +12,8 @@
#include <Indoor/nav/dijkstra/DijkstraPath.h>
#include <Indoor/geo/Point3.h>
#include "nav/grid/State.h"
namespace Floorplan {
class IndoorMap;
}
@@ -99,11 +101,11 @@ public:
/** NOTE: must be called from Qt's main thread! */
Q_INVOKABLE void showParticles(const void* particles) {
showParticles((const std::vector<K::Particle<MyState>>*) particles);
showParticles((const std::vector<K::Particle<GridBased::MyState>>*) particles);
}
/** NOTE: must be called from Qt's main thread! */
void showParticles(const std::vector<K::Particle<MyState>>* particles);
void showParticles(const std::vector<K::Particle<GridBased::MyState>>* particles);

2
ui/map/2D/Path2D.h
View File

@@ -8,7 +8,7 @@
#include <Indoor/nav/dijkstra/DijkstraPath.h>
#include <Indoor/grid/Grid.h>
#include "../nav/Node.h"
#include "../nav/grid/Node.h"
class Path2D : public Renderable2D {

8
ui/map/3D/MapView3D.h
View File

@@ -16,7 +16,9 @@
#include "elements/ColorPoints.h"
#include "elements/Object.h"
#include "../nav/State.h"
#include "../nav/Observation.h"
#include "../nav/grid/State.h"
namespace Floorplan {
class IndoorMap;
@@ -122,11 +124,11 @@ public:
/** NOTE: must be called from Qt's main thread! */
Q_INVOKABLE void showParticles(const void* particles) {
showParticles((const std::vector<K::Particle<MyState>>*) particles);
showParticles((const std::vector<K::Particle<GridBased::MyState>>*) particles);
}
/** NOTE: must be called from Qt's main thread! */
void showParticles(const std::vector<K::Particle<MyState>>* particles) {
void showParticles(const std::vector<K::Particle<GridBased::MyState>>* particles) {
this->colorPoints->setFromParticles(*particles);
}

2
ui/map/3D/elements/ColorPoints.h
View File

@@ -11,7 +11,7 @@
#include "../Renderable.h"
#include "../../../../Settings.h"
#include "../../../../nav/Node.h"
#include "../../../../nav/grid/Node.h"
class ColorPoints : public Renderable {