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

Extract function for mesh faces setup

pull/5522/head
Steve M 2024-03-30 10:52:34 -07:00
parent 54f0673686
commit 51ddcbe5a4
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,17 +72,17 @@ void USDImporterImplTinyusdz::InternReadFile(
const std::string &pFile, const std::string &pFile,
aiScene *pScene, aiScene *pScene,
IOSystem *pIOHandler) { IOSystem *pIOHandler) {
bool ret{false}; bool ret{ false };
tinyusdz::USDLoadOptions options; tinyusdz::USDLoadOptions options;
tinyusdz::Stage stage; tinyusdz::Stage stage;
std::string warn, err; std::string warn, err;
if (isUsdc(pFile)) { if (isUsdc(pFile)) {
ret = LoadUSDCFromFile(pFile, &stage, &warn, &err, options); ret = LoadUSDCFromFile(pFile, &stage, &warn, &err, options);
} else if(isUsda(pFile)) { } else if (isUsda(pFile)) {
ret = LoadUSDAFromFile(pFile, &stage, &warn, &err, options); ret = LoadUSDAFromFile(pFile, &stage, &warn, &err, options);
} else if(isUsdz(pFile)) { } else if (isUsdz(pFile)) {
ret = LoadUSDZFromFile(pFile, &stage, &warn, &err, options); ret = LoadUSDZFromFile(pFile, &stage, &warn, &err, options);
} else if(isUsd(pFile)) { } else if (isUsd(pFile)) {
ret = LoadUSDFromFile(pFile, &stage, &warn, &err, options); ret = LoadUSDFromFile(pFile, &stage, &warn, &err, options);
} }
if (!ret) { if (!ret) {
@ -105,6 +105,7 @@ void USDImporterImplTinyusdz::InternReadFile(
for (size_t i = 0; i < pScene->mNumMeshes; i++) { for (size_t i = 0; i < pScene->mNumMeshes; i++) {
pScene->mMeshes[i] = new aiMesh(); pScene->mMeshes[i] = new aiMesh();
verticesForMesh(render_scene, pScene, i); verticesForMesh(render_scene, pScene, i);
facesForMesh(render_scene, pScene, i);
pScene->mRootNode->mMeshes[i] = static_cast<unsigned int>(i); pScene->mRootNode->mMeshes[i] = static_cast<unsigned int>(i);
} }
} }
@ -120,16 +121,23 @@ void USDImporterImplTinyusdz::verticesForMesh(
pScene->mMeshes[meshIdx]->mVertices[j].y = render_scene.meshes[meshIdx].points[j][1]; pScene->mMeshes[meshIdx]->mVertices[j].y = render_scene.meshes[meshIdx].points[j][1];
pScene->mMeshes[meshIdx]->mVertices[j].z = render_scene.meshes[meshIdx].points[j][2]; pScene->mMeshes[meshIdx]->mVertices[j].z = render_scene.meshes[meshIdx].points[j][2];
} }
}
void USDImporterImplTinyusdz::facesForMesh(
const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene,
size_t meshIdx) {
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;
for (size_t i = 0; i < pScene->mMeshes[meshIdx]->mNumFaces; ++i) { for (size_t faceIdx = 0; faceIdx < pScene->mMeshes[meshIdx]->mNumFaces; ++faceIdx) {
pScene->mMeshes[meshIdx]->mFaces[i].mNumIndices = render_scene.meshes[meshIdx].faceVertexCounts[i]; pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices = render_scene.meshes[meshIdx].faceVertexCounts[faceIdx];
pScene->mMeshes[meshIdx]->mFaces[i].mIndices = new unsigned int[pScene->mMeshes[meshIdx]->mFaces[i].mNumIndices]; pScene->mMeshes[meshIdx]->mFaces[faceIdx].mIndices = new unsigned int[pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices];
for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mFaces[i].mNumIndices; ++j) { for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices; ++j) {
pScene->mMeshes[meshIdx]->mFaces[i].mIndices[j] = render_scene.meshes[meshIdx].faceVertexIndices[j + faceVertIdxOffset]; pScene->mMeshes[meshIdx]->mFaces[faceIdx].mIndices[j] =
render_scene.meshes[meshIdx].faceVertexIndices[j + faceVertIdxOffset];
} }
faceVertIdxOffset += pScene->mMeshes[meshIdx]->mFaces[i].mNumIndices; faceVertIdxOffset += pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices;
} }
} }

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

@ -67,6 +67,11 @@ public:
const tinyusdz::tydra::RenderScene &render_scene, const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene, aiScene *pScene,
size_t meshIdx); size_t meshIdx);
void facesForMesh(
const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene,
size_t meshIdx);
}; };
} // namespace Assimp } // namespace Assimp
#endif // AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED #endif // AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED