GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using variable to store tinyusdz repo, moved include from hpp to cpp file, minor syntax change

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-08-30 14:10:30 +03:00
parent 380e0f323d
commit ba2ed53ae2
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openVulkanoCpp/Scene/MeshLoader.cpp
View File

@@ -5,6 +5,7 @@
*/
#include "MeshLoader.hpp"
#include "Scene/Geometry.hpp"
#include "Base/Logger.hpp"
#if __has_include("assimp/Importer.hpp")
#include <assimp/Importer.hpp>
@@ -35,7 +36,7 @@ namespace
namespace OpenVulkano::Scene
{
void MeshLoader::parseAssimpFile(Geometry *geometry, const std::string& file)
void MeshLoader::ParseAssimpFile(Geometry *geometry, const std::string& file)
{
#ifdef ASSIMP_AVAILABLE
Assimp::Importer importer;
@@ -90,7 +91,7 @@ namespace OpenVulkano::Scene
#endif
}
void MeshLoader::parseUSDFile(Geometry *geometry, const std::string& file)
void MeshLoader::ParseUSDFile(Geometry *geometry, const std::string& file)
{
tinyusdz::Stage stage;
std::string warning, err;
@@ -156,11 +157,11 @@ namespace OpenVulkano::Scene
if (ends_with(file, ".usd") || ends_with(file, ".usda") || ends_with(file, ".usdc") || ends_with(file, ".usdz"))
{
parseUSDFile(geometry, file);
ParseUSDFile(geometry, file);
}
else
{
parseAssimpFile(geometry, file);
ParseAssimpFile(geometry, file);
}
return geometry;