diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp b/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp index 10dff252e..3771a7c34 100644 --- a/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp +++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp @@ -115,8 +115,8 @@ void USDImporterImplTinyusdz::InternReadFile( for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) { pScene->mMeshes[meshIdx] = new aiMesh(); pScene->mMeshes[meshIdx]->mName.Set(render_scene.meshes[meshIdx].element_name); - verticesForMesh(render_scene, pScene, meshIdx); - facesForMesh(render_scene, pScene, meshIdx); + verticesForMesh(render_scene, pScene, meshIdx, nameWExt)); + facesForMesh(render_scene, pScene, meshIdx, nameWExt)); normalsForMesh(render_scene, pScene, meshIdx); materialsForMesh(render_scene, pScene, meshIdx); uvsForMesh(render_scene, pScene, meshIdx); @@ -133,7 +133,8 @@ void USDImporterImplTinyusdz::InternReadFile( void USDImporterImplTinyusdz::verticesForMesh( const tinyusdz::tydra::RenderScene &render_scene, aiScene *pScene, - size_t meshIdx) { + size_t meshIdx, + const std::string &nameWExt) { pScene->mMeshes[meshIdx]->mNumVertices = render_scene.meshes[meshIdx].points.size(); pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices]; for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) { @@ -146,7 +147,8 @@ void USDImporterImplTinyusdz::verticesForMesh( void USDImporterImplTinyusdz::facesForMesh( const tinyusdz::tydra::RenderScene &render_scene, aiScene *pScene, - size_t meshIdx) { + size_t meshIdx, + const std::string &nameWExt) { pScene->mMeshes[meshIdx]->mNumFaces = render_scene.meshes[meshIdx].faceVertexCounts.size(); pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces](); size_t faceVertIdxOffset = 0; diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdz.h b/code/AssetLib/USD/USDLoaderImplTinyusdz.h index 490421624..5f5d29c15 100644 --- a/code/AssetLib/USD/USDLoaderImplTinyusdz.h +++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.h @@ -66,12 +66,14 @@ public: void verticesForMesh( const tinyusdz::tydra::RenderScene &render_scene, aiScene *pScene, - size_t meshIdx); + size_t meshIdx, + const std::string &nameWExt); void facesForMesh( const tinyusdz::tydra::RenderScene &render_scene, aiScene *pScene, - size_t meshIdx); + size_t meshIdx, + const std::string &nameWExt); void normalsForMesh( const tinyusdz::tydra::RenderScene &render_scene,