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

gltfio: honor node labels if they exist.

Browse Source 
In glTF, multiple nodes can refer to the same mesh, and each node can be
assigned a unqiue string label. Previously we used NameComponentManager
to annotate entities with mesh labels rather than node labels. This was
wrong because Filament entities are 1:1 with nodes, not meshes.

We still fall back to mesh labels when node labels are not provided.
This commit is contained in:
Philip Rideout
2020-01-03 09:18:59 -08:00
parent 17893ecefd
commit 06b9bb0c34
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/gltfio/src/AssetLoader.cpp
View File

@@ -323,11 +323,15 @@ void FAssetLoader::createRenderable(const cgltf_node* node, Entity entity) {
Primitive* outputPrim = mMeshCache[mesh].data();
const cgltf_primitive* inputPrim = &mesh->primitives[0];
if (mNameManager && mesh->name) {
// Create a name component using the node label if it exists, otherwise use the mesh label.
const char* name = node->name ? node->name : mesh->name;
if (mNameManager && name) {
mNameManager->addComponent(entity);
mNameManager->setName(mNameManager->getInstance(entity), mesh->name);
mNameManager->setName(mNameManager->getInstance(entity), name);
}
const char* name = mesh->name ? mesh->name : (node->name ? node->name : "mesh");
// If neither a node or mesh name is provided in the glTF, use "node" for error messages.
name = name ? name : "node";
Aabb aabb;