celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked editor camera

Browse Source
This commit is contained in:
antopilo
2023-03-07 17:26:13 -05:00
parent 10baf5271a
commit 6cbad0e13b
20 changed files with 126 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Nuake/src/Resource/ModelLoader.cpp
View File

@@ -13,7 +13,7 @@ namespace Nuake
ModelLoader::ModelLoader() {}
ModelLoader::~ModelLoader() {}
Ref<Model> ModelLoader::LoadModel(const std::string& path)
Ref<Model> ModelLoader::LoadModel(const std::string& path, bool absolute)
{
m_Meshes.clear();
Ref<Model> model = CreateRef<Model>(path);
@@ -27,8 +27,9 @@ namespace Nuake
aiProcess_FixInfacingNormals |
aiProcess_CalcTangentSpace;
modelDir = path + "/../";
const aiScene* scene = import.ReadFile(path, importFlags);
modelDir = absolute ? path + "/../" : FileSystem::Root + path + "/../";
const std::string filePath = absolute ? path : FileSystem::Root + path;
const aiScene* scene = import.ReadFile(filePath, importFlags);
if (!scene || scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE || !scene->mRootNode)
{
std::string assimpErrorMsg = std::string(import.GetErrorString());