Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tinyusdz (#5849)

Browse Source 
* Update tinyusdz to latest git commit

* Update patch file

* Bump to latest tinyusdz version

* Remove unused var (fix broken build for clients treating warnings-as-errors)

---------

Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
This commit is contained in:
Steve M
2024-11-01 03:33:50 -07:00
committed by GitHub
parent 7634cf84ca
commit 401279e2f9
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,8 +278,6 @@ void USDImporterImplTinyusdz::verticesForMesh(
std::vector<const tinyusdz::tydra::SkelNode *> skeletonNodes;
skeletonNodes.push_back(&render_scene.skeletons[skeleton_id].root_node);
for (int i = 0; i < skeletonNodes.size(); ++i) {
const tinyusdz::tydra::SkelNode *skeletonNode = skeletonNodes[i];
for (const auto &child : skeletonNodes[i]->children) {
skeletonNodes.push_back(&child);
}
@@ -319,7 +317,7 @@ void USDImporterImplTinyusdz::verticesForMesh(
aiBonesVertexWeights[jointIndex].emplace_back(vertexIndex, jointWeight);
}
}
}
}
for (int boneIndex = 0; boneIndex < numBones; ++boneIndex) {
const unsigned int numWeightsForBone = aiBonesVertexWeights[boneIndex].size();
@@ -767,12 +765,12 @@ aiNode *USDImporterImplTinyusdz::nodesRecursive(
cNode->mChildren[i] = nodesRecursive(cNode, childNode, skeletons);
++i;
}
if (skelNode != nullptr) {
// Convert USD skeleton into an Assimp node and make it the last child
cNode->mChildren[cNode->mNumChildren-1] = skeletonNodesRecursive(cNode, *skelNode);
}
return cNode;
}
@@ -796,7 +794,7 @@ aiNode *USDImporterImplTinyusdz::skeletonNodesRecursive(
const tinyusdz::tydra::SkelNode &childJoint = joint.children[i];
cNode->mChildren[i] = skeletonNodesRecursive(cNode, childJoint);
}
return cNode;
}

4
code/CMakeLists.txt
View File

@@ -944,8 +944,8 @@ IF (ASSIMP_BUILD_USD_IMPORTER)
# Note: ALWAYS specify a git commit hash (or tag) instead of a branch name; using a branch
# name can lead to non-deterministic (unpredictable) results since the code is potentially
# in flux
# "dev" branch, 9 Jul 2024
set(TINYUSDZ_GIT_TAG "bd2a1edbbf69f352a6c40730114db9918c384848")
# "dev" branch, 28 Oct 2024
set(TINYUSDZ_GIT_TAG "36f2aabb256b360365989c01a52f839a57dfe2a6")
message("****")
message("\n\n**** Cloning tinyusdz repo, git tag ${TINYUSDZ_GIT_TAG}\n\n")

10
contrib/tinyusdz/patches/tinyusdz.patch
View File

@@ -1,7 +1,7 @@
diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h tinyusdz_repo_patch/src/external/stb_image_resize2.h
--- autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h 2024-07-09 21:29:48.556969900 -0700
+++ tinyusdz_repo_patch/src/external/stb_image_resize2.h 2024-07-09 23:03:47.379316700 -0700
@@ -2404,6 +2404,38 @@ static stbir__inline stbir_uint8 stbir__
--- autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h 2024-10-27 03:26:45.457163600 -0700
+++ tinyusdz_repo_patch/src/external/stb_image_resize2.h 2024-10-27 03:31:09.255211100 -0700
@@ -2500,6 +2500,38 @@ static stbir__inline stbir_uint8 stbir__
}
}
@@ -37,6 +37,6 @@ diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h
+ return 0;
+ }
+
#elif defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__) // 64-bit ARM on MSVC (not clang)
#endif
static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)