Linloir/qt-scene-editor
1
0
Fork 0
mirror of https://github.com/Linloir/SceneEditor.git synced 2025-12-17 07:28:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Linloir 2022-12-13 10:06:28 +08:00
commit e203ee0ff3
No known key found for this signature in database
GPG Key ID: 58EEB209A0F2C366
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FinalProject/FinalProject.vcxproj
View File

@ -13,7 +13,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{BB1EFCBB-6CD7-4283-8C3F-69AE88470EED}</ProjectGuid>
<Keyword>QtVS_v304</Keyword>
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.22621.0</WindowsTargetPlatformVersion>
<QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup>

2
FinalProject/model.cpp
View File

@ -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) {

1
FinalProject/sceneviewer.cpp
View File

@ -10,6 +10,7 @@
#include "vao.h"
#include "shader.h"
#include "logger.h"
#include "model.h"
using std::vector;