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

Introduce intermediate function

pull/5522/head
Steve M 2024-03-30 09:33:40 -07:00
parent b1bd8d700a
commit 847859e47d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,6 @@ Copyright (c) 2006-2024, assimp team
#include <assimp/StringUtils.h> #include <assimp/StringUtils.h>
#include <assimp/StreamReader.h> #include <assimp/StreamReader.h>
#include "tydra/render-data.hh"
#include "tydra/scene-access.hh" #include "tydra/scene-access.hh"
#include "tydra/shader-network.hh" #include "tydra/shader-network.hh"
#include "USDLoaderImplTinyusdz.h" #include "USDLoaderImplTinyusdz.h"
@ -105,17 +104,24 @@ void USDImporterImplTinyusdz::InternReadFile(
// Export meshes // Export meshes
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();
pScene->mMeshes[i]->mNumVertices = render_scene.meshes[i].points.size(); verticesForMesh(render_scene, pScene, i);
pScene->mMeshes[i]->mVertices = new aiVector3D[pScene->mMeshes[i]->mNumVertices];
for (size_t j = 0; j < pScene->mMeshes[i]->mNumVertices; ++j) {
pScene->mMeshes[i]->mVertices[j].x = render_scene.meshes[i].points[j][0];
pScene->mMeshes[i]->mVertices[j].y = render_scene.meshes[i].points[j][1];
pScene->mMeshes[i]->mVertices[j].z = render_scene.meshes[i].points[j][2];
}
pScene->mRootNode->mMeshes[i] = static_cast<unsigned int>(i); pScene->mRootNode->mMeshes[i] = static_cast<unsigned int>(i);
} }
} }
void USDImporterImplTinyusdz::verticesForMesh(
const tinyusdz::tydra::RenderScene &render_scene,
aiScene *pScene,
size_t meshIdx) {
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) {
pScene->mMeshes[meshIdx]->mVertices[j].x = render_scene.meshes[meshIdx].points[j][0];
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];
}
}
} // namespace Assimp } // namespace Assimp
#endif // !! ASSIMP_BUILD_NO_USD_IMPORTER #endif // !! ASSIMP_BUILD_NO_USD_IMPORTER

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

@ -50,6 +50,7 @@ Copyright (c) 2006-2024, assimp team
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
#include "tinyusdz.hh" #include "tinyusdz.hh"
#include "tydra/render-data.hh"
namespace Assimp { namespace Assimp {
class USDImporterImplTinyusdz { class USDImporterImplTinyusdz {
@ -61,6 +62,11 @@ public:
const std::string &pFile, const std::string &pFile,
aiScene *pScene, aiScene *pScene,
IOSystem *pIOHandler); IOSystem *pIOHandler);
void verticesForMesh(
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