ccolin/m2-ar-projet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use Qt resources for the drone model

Browse Source
This commit is contained in:
ccolin 2020-12-22 18:15:19 +01:00
parent 1026231bb4
commit c0116528a7
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projet.pro
View File

@ -4,6 +4,8 @@ TEMPLATE = app
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
CONFIG += qt debug CONFIG += qt debug
RESOURCES += resources.qrc
SOURCES += src/main.cc SOURCES += src/main.cc
SOURCES += src/main_window.cc SOURCES += src/main_window.cc
SOURCES += src/opengl_mesh.cc SOURCES += src/opengl_mesh.cc

7
resources.qrc Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
<file>mdl/dji600.obj</file>
<file>mdl/dji600.mtl</file>
</qresource>
</RCC>

16
src/drone_controller.cc
View File

@ -6,6 +6,7 @@
#include <QJsonArray> #include <QJsonArray>
#include <QDebug> #include <QDebug>
#include <QFile>
Waypoint::Waypoint(unsigned frame, QVector3D pos) Waypoint::Waypoint(unsigned frame, QVector3D pos)
@ -25,12 +26,19 @@ OpenGLMesh *Drone::mesh = nullptr;
Drone::Drone() { Drone::Drone() {
if (!mesh_initialized) { if (!mesh_initialized) {
tinyobj::ObjReaderConfig reader_config; QFile obj_file(":/mdl/dji600.obj");
reader_config.mtl_search_path = "../mdl/"; // Path to material files QFile mtl_file(":/mdl/dji600.mtl");
obj_file.open(QIODevice::ReadOnly | QIODevice::Text);
mtl_file.open(QIODevice::ReadOnly | QIODevice::Text);
std::string obj = obj_file.readAll().toStdString();
std::string mtl = mtl_file.readAll().toStdString();
tinyobj::ObjReaderConfig cfg;
cfg.triangulate = true;
cfg.vertex_color = false;
tinyobj::ObjReader reader; tinyobj::ObjReader reader;
if (!reader.ParseFromFile("../mdl/dji600.obj", reader_config)) { if (!reader.ParseFromString(obj, mtl, cfg)) {
if (!reader.Error().empty()) { if (!reader.Error().empty()) {
qWarning() << "Erreur lors de la lecture de ../mdl/dji600.obj"; qWarning() << "Erreur lors de la lecture de du modèle";
} }
exit(1); exit(1);
} }