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

Nascent valid assimp scenePtr (but meshes have zero vertices)

pull/5522/head
Steve M 2024-03-30 08:06:04 -07:00
parent ed42e4dc6d
commit 1afc1d90e7
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,9 @@ 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/shader-network.hh"
#include "USDLoaderImplTinyusdz.h" #include "USDLoaderImplTinyusdz.h"
#include "USDLoaderUtil.h" #include "USDLoaderUtil.h"
@ -70,15 +73,39 @@ void USDImporterImplTinyusdz::InternReadFile(
const std::string &pFile, const std::string &pFile,
aiScene *pScene, aiScene *pScene,
IOSystem *pIOHandler) { IOSystem *pIOHandler) {
DefaultLogger::create("AssimpLog.txt", Logger::VERBOSE); bool ret{false};
tinyusdz::USDLoadOptions options;
tinyusdz::Stage stage;
std::string warn, err;
if (isUsdc(pFile)) { if (isUsdc(pFile)) {
tinyusdz::USDLoadOptions options; ret = LoadUSDCFromFile(pFile, &stage, &warn, &err, options);
tinyusdz::Stage stage; } else if(isUsda(pFile)) {
std::string warn, err; ret = LoadUSDAFromFile(pFile, &stage, &warn, &err, options);
bool ret = LoadUSDCFromFile(pFile, &stage, &warn, &err, options); } else if(isUsdz(pFile)) {
if (!ret) { ret = LoadUSDZFromFile(pFile, &stage, &warn, &err, options);
pScene = nullptr; } else if(isUsd(pFile)) {
} ret = LoadUSDFromFile(pFile, &stage, &warn, &err, options);
}
if (!ret) {
return;
}
tinyusdz::tydra::RenderScene render_scene;
tinyusdz::tydra::RenderSceneConverter converter;
ret = converter.ConvertToRenderScene(stage, &render_scene);
if (!ret) {
return;
}
pScene->mNumMeshes = render_scene.meshes.size();
pScene->mMeshes = new aiMesh *[pScene->mNumMeshes]();
// Create root node
pScene->mRootNode = new aiNode();
pScene->mRootNode->mNumMeshes = pScene->mNumMeshes;
pScene->mRootNode->mMeshes = new unsigned int[pScene->mRootNode->mNumMeshes];
// Export meshes
for (size_t i = 0; i < pScene->mNumMeshes; i++) {
pScene->mMeshes[i] = new aiMesh();
pScene->mRootNode->mMeshes[i] = static_cast<unsigned int>(i);
} }
} }