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

Revert adding APIs

Browse Source
This commit is contained in:
daemyung jang
2022-02-04 07:26:23 +09:00
committed by Mathias Agopian
parent 1924810c17
commit 0d2faa4573
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filament/include/filament/RenderableManager.h
View File

@@ -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.

6
filament/src/components/RenderableManager.cpp
View File

@@ -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);
}

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

@@ -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());
}
}
}

3
libs/gltfio/src/ResourceLoader.cpp
View File

@@ -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);