changed 3D rendering

added pan/zoom gesture

mapview/3D/navMesh/NavMeshModel.h

@@ -0,0 +1,85 @@
+#ifndef NAVMESHMODEL_H
+#define NAVMESHMODEL_H
+
+
+#include <Indoor/floorplan/v2/Floorplan.h>
+#include <Indoor/navMesh/NavMesh.h>
+#include <Indoor/navMesh/NavMeshFactory.h>
+#include <Indoor/navMesh/NavMeshFactoryListener.h>
+
+#include <QProgressDialog>
+#include <QApplication>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include "QNavMeshSettings.h"
+
+/**
+ * used for 3D NavMesh rendering
+ */
+class NavMeshModel {
+
+private:
+
+	NM::NavMesh<NM::NavMeshTriangle> navMesh;
+	NM::NavMeshSettings settings;
+	Floorplan::IndoorMap* im;
+
+public:
+
+	NavMeshModel() : navMesh() {
+		;
+	}
+
+	NM::NavMesh<NM::NavMeshTriangle>* getNavMesh() {return &navMesh;}
+
+
+	class Listener : public NM::NavMeshFactoryListener {
+
+	private:
+		QDialog dlg;
+		QLabel* lbl1;
+		QProgressBar* bar1;
+
+	public:
+		Listener() {
+			QVBoxLayout* lay = new QVBoxLayout(&dlg);
+			lbl1 = new QLabel();		lay->addWidget(lbl1);
+			bar1 = new QProgressBar();	lay->addWidget(bar1);
+			dlg.resize(350, 90);
+			dlg.setWindowTitle("NavMesh building");
+			dlg.show();
+		}
+		~Listener() {
+			dlg.close();
+		}
+
+		void onNavMeshBuildUpdateMajor(const std::string& what) override {
+			lbl1->setText(what.c_str());
+			QApplication::processEvents();
+		}
+		void onNavMeshBuildUpdateMajor(const int cnt, const int cur) override {
+			bar1->setValue(cur*100/cnt);
+			QApplication::processEvents();
+		}
+
+	};
+
+	void rebuild(Floorplan::IndoorMap* im) {
+
+		Listener l;
+
+		QNavMeshSettings qs(&settings);
+		qs.exec();
+
+		if (qs.ok) {
+			NM::NavMeshFactory<NM::NavMeshTriangle> fac(&navMesh, settings);
+			fac.build(im, &l);
+		}
+
+	}
+
+};
+
+
+#endif // NAVMESHMODEL_H

mapview/3D/navMesh/NavMeshRenderer.h

@@ -0,0 +1,157 @@
+#ifndef NAVMESHRENDERER_H
+#define NAVMESHRENDERER_H
+
+
+
+#include <unordered_set>
+#include <Indoor/navMesh/NavMesh.h>
+#include <Indoor/navMesh/NavMeshTriangle.h>
+#include <Indoor/navMesh/NavMeshType.h>
+
+#include <QPainter>
+#include <QOpenGLWidget>
+
+#include "../misc/Renderable3D.h"
+#include "../misc/Shader.h"
+#include "../misc/TriangleData.h"
+
+class NavMeshRenderer {
+
+private:
+
+	// settings
+	//GridRendererColorMode colorMode = GridRendererColorMode::SHOW_NODE_IMPORTANCE;
+	bool showEdges = false;
+
+	struct Color {
+		float r,g,b;
+		Color() : r(1), g(0), b(0) {;}
+		Color(float r, float g, float b) : r(r), g(g), b(b) {;}
+	};
+
+	/** node color depending on the node's type. see ctor */
+	Color colors[200];
+
+public:
+
+	/** ctor */
+	NavMeshRenderer()  {
+
+		colors[GridNode::TYPE_FLOOR] = Color(0.4, 0.4, 0.4);
+		colors[GridNode::TYPE_STAIR] = Color(0,0,1);
+		colors[GridNode::TYPE_ELEVATOR] = Color(0,0,1);
+		colors[GridNode::TYPE_DOOR] = Color(0.0, 0.0, 0.0);
+
+		colors[GridNode::TYPE_OUTDOOR] = Color(0.0, 0.5, 0.0);
+
+	}
+
+
+//	void setNodeColorMode(const GridRendererColorMode mode) {this->colorMode = mode;}
+	void setShowEdges(const bool show) {this->showEdges = show;}
+
+
+	/** render the given grid using GL commands */
+	void render(const RenderSettings& rs, NM::NavMesh<NM::NavMeshTriangle>* navMesh, QOpenGLWidget* dst) {
+
+		if (navMesh == nullptr) {return;}
+
+
+		rs.shader->bind();
+		rs.shader->setModelMatrix(QMatrix4x4());
+
+		TriangleData data;
+
+		for (const NM::NavMeshTriangle* tria : *navMesh) {
+
+			Point3 color;
+
+			switch (tria->getType()) {
+				case (int) NM::NavMeshType::FLOOR_INDOOR:	color = Point3(0.8, 0.8, 0.8); break;
+				case (int) NM::NavMeshType::FLOOR_OUTDOOR:	color = Point3(0.1, 0.8, 0.1); break;
+				case (int) NM::NavMeshType::DOOR:			color = Point3(0.7, 0.7, 0.8); break;
+				case (int) NM::NavMeshType::STAIR_LEVELED:	color = Point3(0.5, 0.5, 0.5); break;
+				case (int) NM::NavMeshType::STAIR_SKEWED:	color = Point3(0.6, 0.6, 0.6); break;
+			}
+
+			data.addTriangle(tria->getP1(), tria->getP3(), tria->getP2(), Point3(0,0,1), color.x, color.y, color.z, 1.0f);
+
+//			vertices.insert(vertices.end(), {tria->getP1().x, tria->getP1().y, tria->getP1().z});
+//			vertices.insert(vertices.end(), {tria->getP3().x, tria->getP3().y, tria->getP3().z});
+//			vertices.insert(vertices.end(), {tria->getP2().x, tria->getP2().y, tria->getP2().z});
+
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+
+		}
+
+		rs.shader->setVertices(data.getVertices().data());
+		rs.shader->setVertexColor(data.getRGBA().data());
+		glDrawArrays(GL_TRIANGLES, 0, data.getVertices().size()/3);
+		rs.shader->unsetVertices();
+		rs.shader->unsetVertexColor();
+
+		data.clear();
+
+
+		for (const NM::NavMeshTriangle* tria : *navMesh) {
+
+			Point3 color;
+
+			switch (tria->getType()) {
+				case (int) NM::NavMeshType::FLOOR_INDOOR:	color = Point3(0.6, 0.6, 0.6); break;
+				case (int) NM::NavMeshType::FLOOR_OUTDOOR:	color = Point3(0.0, 0.6, 0.0); break;
+				case (int) NM::NavMeshType::DOOR:			color = Point3(0.5, 0.5, 0.6); break;
+				case (int) NM::NavMeshType::STAIR_LEVELED:	color = Point3(0.4, 0.4, 0.4); break;
+				case (int) NM::NavMeshType::STAIR_SKEWED:	color = Point3(0.4, 0.4, 0.4); break;
+			}
+
+			const float o = 0.001f;
+			data.addLine(tria->getP1(), tria->getP2(), color.x, color.y, color.z, 1);
+			data.addLine(tria->getP2(), tria->getP3(), color.x, color.y, color.z, 1);
+			data.addLine(tria->getP3(), tria->getP1(), color.x, color.y, color.z, 1);
+
+//			vertices.insert(vertices.end(), {tria->getP1().x, tria->getP1().y, tria->getP1().z+o});
+//			vertices.insert(vertices.end(), {tria->getP2().x, tria->getP2().y, tria->getP2().z+o});
+
+//			vertices.insert(vertices.end(), {tria->getP2().x, tria->getP2().y, tria->getP2().z+o});
+//			vertices.insert(vertices.end(), {tria->getP3().x, tria->getP3().y, tria->getP3().z+o});
+
+//			vertices.insert(vertices.end(), {tria->getP3().x, tria->getP3().y, tria->getP3().z+o});
+//			vertices.insert(vertices.end(), {tria->getP1().x, tria->getP1().y, tria->getP1().z+o});
+
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+//			colors.insert(colors.end(), {color.x, color.y, color.z, 1});
+
+		}
+
+		rs.shader->setVertices(data.getVertices().data());
+		rs.shader->setVertexColor(data.getRGBA().data());
+		glDrawArrays(GL_LINES, 0, data.getVertices().size()/3);
+		rs.shader->unsetVertices();
+		rs.shader->unsetVertexColor();
+
+		rs.shader->release();
+
+	}
+
+//	std::vector<MyNode> lint() {
+//		std::vector<MyNode> vec;
+//		lintStair(vec);
+//		return vec;
+//	}
+
+//	void lintStair(std::vector<MyNode>& vec) {
+//		for (MyNode& n1 : *grid) {
+//			if (n1.getNumNeighbors() <= 5) { vec.push_back(n1);}
+//		}
+//	}
+
+};
+
+#endif // NAVMESHRENDERER_H

mapview/3D/navMesh/QNavMeshSettings.cpp

@@ -0,0 +1,102 @@
+#include "QNavMeshSettings.h"
+
+#include <Indoor/navMesh/NavMeshSettings.h>
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QSlider>
+#include <QSlider>
+#include <QDialogButtonBox>
+
+QNavMeshSettings::QNavMeshSettings(NM::NavMeshSettings* settings, QWidget* parent) : QDialog(parent) {
+
+	QGridLayout* lay = new QGridLayout(this);
+	this->setLayout(lay);
+	int row = 0;
+
+	this->setWindowTitle("NavMesh Settings");
+	this->setMinimumWidth(350);
+
+	// MAX QUALITY
+	{
+		lay->addWidget(new QLabel("smallest element"), row, 0);
+		QLabel* lblQuality = new QLabel("");
+		lay->addWidget(lblQuality, row, 2);
+		QSlider* sldQuality = new QSlider(Qt::Orientation::Horizontal); sldQuality->setMinimum(10); sldQuality->setMaximum(30);
+		connect(sldQuality, &QSlider::valueChanged, [settings, sldQuality, lblQuality] () {
+			settings->maxQuality_m = sldQuality->value() / 100.0f;
+			lblQuality->setText(QString("%1 m").arg(settings->maxQuality_m, 5, 'f', 2, 0));
+		});
+		sldQuality->setValue(settings->maxQuality_m * 100.0f);
+		lay->addWidget(sldQuality, row, 1);
+		++row;
+	}
+
+	// AGENT HEIGHT
+	{
+		lay->addWidget(new QLabel("agent height"), row, 0);
+		QLabel* lblHeight = new QLabel("");
+		lay->addWidget(lblHeight, row, 2);
+		QSlider* sldHeight = new QSlider(Qt::Orientation::Horizontal); sldHeight->setMinimum(10); sldHeight->setMaximum(200);
+		connect(sldHeight, &QSlider::valueChanged, [settings, sldHeight, lblHeight] () {
+			settings->agentHeight = sldHeight->value() / 100.0f;
+			lblHeight->setText(QString("%1 m").arg(settings->agentHeight, 5, 'f', 2, 0));
+		});
+		sldHeight->setValue(settings->agentHeight * 100.0f);
+		lay->addWidget(sldHeight, row, 1);
+		++row;
+	}
+
+	// AGENT RADIUS
+	{
+		lay->addWidget(new QLabel("agent radius"), row, 0);
+		QLabel* lblRadius = new QLabel("");
+		lay->addWidget(lblRadius, row, 2);
+		QSlider* sldRadius = new QSlider(Qt::Orientation::Horizontal); sldRadius->setMinimum(5); sldRadius->setMaximum(60);
+		connect(sldRadius, &QSlider::valueChanged, [settings, sldRadius, lblRadius] () {
+			settings->agentRadius = sldRadius->value() / 100.0f;
+			lblRadius->setText(QString("%1 m").arg(settings->agentRadius, 5, 'f', 2, 0));
+		});
+		sldRadius->setValue(settings->agentRadius * 100.0f);
+		lay->addWidget(sldRadius, row, 1);
+		++row;
+	}
+
+
+	// MAX EDGE LENGTH
+	{
+		lay->addWidget(new QLabel("max edge length"), row, 0);
+		QLabel* lblMaxEdgeLength = new QLabel("");
+		lay->addWidget(lblMaxEdgeLength, row, 2);
+		QSlider* sdlMaxEdgeLength = new QSlider(Qt::Orientation::Horizontal); sdlMaxEdgeLength->setMinimum(300); sdlMaxEdgeLength->setMaximum(2000);
+		connect(sdlMaxEdgeLength, &QSlider::valueChanged, [settings, sdlMaxEdgeLength, lblMaxEdgeLength] () {
+			settings->edgeMaxLen = sdlMaxEdgeLength->value() / 100.0f;
+			lblMaxEdgeLength->setText(QString("%1 m").arg(settings->edgeMaxLen, 5, 'f', 2, 0));
+		});
+		sdlMaxEdgeLength->setValue(settings->edgeMaxLen * 100.0f);
+		lay->addWidget(sdlMaxEdgeLength, row, 1);
+		++row;
+	}
+
+	// MIN REGION SIZE
+	{
+		lay->addWidget(new QLabel("min region size"), row, 0);
+		QLabel* lblMinRegionSize = new QLabel("");
+		lay->addWidget(lblMinRegionSize, row, 2);
+		QSlider* sldRegionMinSize = new QSlider(Qt::Orientation::Horizontal); sldRegionMinSize->setMinimum(400); sldRegionMinSize->setMaximum(10000);
+		connect(sldRegionMinSize, &QSlider::valueChanged, [settings, sldRegionMinSize, lblMinRegionSize] () {
+			settings->regionMinSize = sldRegionMinSize->value() / 100.0f;
+			lblMinRegionSize->setText(QString("%1 m").arg(settings->regionMinSize, 5, 'f', 2, 0));
+		});
+		sldRegionMinSize->setValue(settings->regionMinSize * 100.0f);
+		lay->addWidget(sldRegionMinSize, row, 1);
+		++row;
+	}
+
+	QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::StandardButton::Ok | QDialogButtonBox::StandardButton::Close);
+	lay->addWidget(box, row, 0, 1, 3);
+
+	connect(box, &QDialogButtonBox::accepted, [&] () {ok = true; close();});
+	connect(box, &QDialogButtonBox::rejected, [&] () {ok = false; close();});
+
+}

mapview/3D/navMesh/QNavMeshSettings.h

@@ -0,0 +1,24 @@
+#ifndef QNAVMESHSETTINGS_H
+#define QNAVMESHSETTINGS_H
+
+#include <QObject>
+#include <QDialog>
+
+namespace NM {
+	class NavMeshSettings;
+}
+
+class QNavMeshSettings : public QDialog {
+
+	Q_OBJECT
+
+
+public:
+
+	QNavMeshSettings(NM::NavMeshSettings* settings, QWidget* parent = nullptr);
+
+	bool ok = false;
+
+};
+
+#endif // QNAVMESHSETTINGS_H