From 0d2faa4573fe2507ebb66ca3b60df06c310b78cc Mon Sep 17 00:00:00 2001 From: daemyung jang Date: Fri, 4 Feb 2022 07:26:23 +0900 Subject: [PATCH] Revert adding APIs --- filament/include/filament/RenderableManager.h | 3 --- filament/src/components/RenderableManager.cpp | 6 ------ libs/gltfio/src/AssetLoader.cpp | 4 +++- libs/gltfio/src/ResourceLoader.cpp | 3 +-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/filament/include/filament/RenderableManager.h b/filament/include/filament/RenderableManager.h index 4f0fed9d78..1dbaf9b92a 100644 --- a/filament/include/filament/RenderableManager.h +++ b/filament/include/filament/RenderableManager.h @@ -488,9 +488,6 @@ public: void setMorphTargetBufferAt(Instance instance, uint8_t level, size_t primitiveIndex, MorphTargetBuffer* morphTargetBuffer, size_t count); //!< \overload - void setMorphTargetBufferAt(Instance instance, uint8_t level, size_t primitiveIndex, - MorphTargetBuffer* morphTargetBuffer); //!< \overload - /** * Gets t * number of morphing in the given entity. diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp index d961c19875..ee1f39604c 100644 --- a/filament/src/components/RenderableManager.cpp +++ b/filament/src/components/RenderableManager.cpp @@ -783,12 +783,6 @@ void RenderableManager::setMorphTargetBufferAt(Instance instance, uint8_t level, upcast(morphTargetBuffer), 0, count); } -void RenderableManager::setMorphTargetBufferAt(Instance instance, uint8_t level, size_t primitiveIndex, - MorphTargetBuffer* morphTargetBuffer) { - upcast(this)->setMorphTargetBufferAt(instance, level, primitiveIndex, - upcast(morphTargetBuffer), 0, morphTargetBuffer->getVertexCount()); -} - size_t RenderableManager::getMorphTargetCount(Instance instance) const noexcept { return upcast(this)->getMorphTargetCount(instance); } diff --git a/libs/gltfio/src/AssetLoader.cpp b/libs/gltfio/src/AssetLoader.cpp index 8a5b2ae68c..dcc0495828 100644 --- a/libs/gltfio/src/AssetLoader.cpp +++ b/libs/gltfio/src/AssetLoader.cpp @@ -546,7 +546,9 @@ void FAssetLoader::createRenderable(const cgltf_data* srcAsset, const cgltf_node // TODO: Set morph target buffers via builder. outputPrim = mResult->mMeshCache[mesh].data(); for (cgltf_size index = 0; index < nprims; ++index, ++outputPrim) { - mRenderableManager.setMorphTargetBufferAt(renderable, 0, index, outputPrim->targets); + MorphTargetBuffer* const morphTargetBuffer = outputPrim->targets; + mRenderableManager.setMorphTargetBufferAt(renderable, 0, index, morphTargetBuffer, + morphTargetBuffer->getVertexCount()); } } } diff --git a/libs/gltfio/src/ResourceLoader.cpp b/libs/gltfio/src/ResourceLoader.cpp index 5acf646347..efc09bdba9 100644 --- a/libs/gltfio/src/ResourceLoader.cpp +++ b/libs/gltfio/src/ResourceLoader.cpp @@ -502,8 +502,7 @@ bool ResourceLoader::loadResources(FFilamentAsset* asset, bool async) { uploadCallback, uploadUserdata(asset))); slot.vertexBuffer->setBufferObjectAt(engine, slot.bufferIndex, bo); continue; - } - else if (slot.indexBuffer) { + } else if (slot.indexBuffer) { if (accessor->component_type == cgltf_component_type_r_8u) { const size_t size16 = size * 2; uint16_t* data16 = (uint16_t*) malloc(size16);