v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add model name param for logging

pull/5522/head
Steve M 2024-04-02 12:00:17 -07:00
parent 86f6c617e0
commit a844fd8610
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
View File

@ -115,8 +115,8 @@ void USDImporterImplTinyusdz::InternReadFile(
for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) { for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
pScene->mMeshes[meshIdx] = new aiMesh(); pScene->mMeshes[meshIdx] = new aiMesh();
pScene->mMeshes[meshIdx]->mName.Set(render_scene.meshes[meshIdx].element_name); pScene->mMeshes[meshIdx]->mName.Set(render_scene.meshes[meshIdx].element_name);
verticesForMesh(render_scene, pScene, meshIdx); verticesForMesh(render_scene, pScene, meshIdx, nameWExt));
facesForMesh(render_scene, pScene, meshIdx); facesForMesh(render_scene, pScene, meshIdx, nameWExt));
normalsForMesh(render_scene, pScene, meshIdx); normalsForMesh(render_scene, pScene, meshIdx);
materialsForMesh(render_scene, pScene, meshIdx); materialsForMesh(render_scene, pScene, meshIdx);
uvsForMesh(render_scene, pScene, meshIdx); uvsForMesh(render_scene, pScene, meshIdx);
@ -133,7 +133,8 @@ void USDImporterImplTinyusdz::InternReadFile(
void USDImporterImplTinyusdz::verticesForMesh( void USDImporterImplTinyusdz::verticesForMesh(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, 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]->mNumVertices = render_scene.meshes[meshIdx].points.size();
pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices]; pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) { for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) {
@ -146,7 +147,8 @@ void USDImporterImplTinyusdz::verticesForMesh(
void USDImporterImplTinyusdz::facesForMesh( void USDImporterImplTinyusdz::facesForMesh(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, 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]->mNumFaces = render_scene.meshes[meshIdx].faceVertexCounts.size();
pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces](); pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces]();
size_t faceVertIdxOffset = 0; size_t faceVertIdxOffset = 0;

6
code/AssetLib/USD/USDLoaderImplTinyusdz.h
View File

@ -66,12 +66,14 @@ public:
void verticesForMesh( void verticesForMesh(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, aiScene *pScene,
size_t meshIdx); size_t meshIdx,
const std::string &nameWExt);
void facesForMesh( void facesForMesh(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, aiScene *pScene,
size_t meshIdx); size_t meshIdx,
const std::string &nameWExt);
void normalsForMesh( void normalsForMesh(
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,