diff --git a/FinalProject/FinalProject.vcxproj b/FinalProject/FinalProject.vcxproj index c5c2ac2..75e1a28 100644 --- a/FinalProject/FinalProject.vcxproj +++ b/FinalProject/FinalProject.vcxproj @@ -13,7 +13,7 @@ {BB1EFCBB-6CD7-4283-8C3F-69AE88470EED} QtVS_v304 - 10.0.22621.0 + 10.0 10.0.22621.0 $(MSBuildProjectDirectory)\QtMsBuild diff --git a/FinalProject/model.cpp b/FinalProject/model.cpp index 38ccca0..6e623df 100644 --- a/FinalProject/model.cpp +++ b/FinalProject/model.cpp @@ -13,6 +13,7 @@ Model::~Model() { // TODO: Maybe delete all meshes? } +// file path is ...\\...\\.obj, and processnode & processmesh have been called here void Model::loadModel(std::string path) { Assimp::Importer importer; const aiScene* scene = importer.ReadFile( @@ -26,6 +27,7 @@ void Model::loadModel(std::string path) { _directory = path.substr(0, path.find_last_of('/')); processNode(scene->mRootNode, scene); + _status = LOADED; } void Model::processNode(aiNode* node, const aiScene* scene) { diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index b809aa4..0b22e72 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -10,6 +10,7 @@ #include "vao.h" #include "shader.h" #include "logger.h" +#include "model.h" using std::vector;