diff --git a/android/filament-android/src/main/cpp/RenderableManager.cpp b/android/filament-android/src/main/cpp/RenderableManager.cpp index 735ef6afcf..6a1b32c622 100644 --- a/android/filament-android/src/main/cpp/RenderableManager.cpp +++ b/android/filament-android/src/main/cpp/RenderableManager.cpp @@ -430,15 +430,6 @@ Java_com_google_android_filament_RenderableManager_nSetGeometryAt__JIIIJJII(JNIE (size_t) offset, (size_t) count); } -extern "C" JNIEXPORT void JNICALL -Java_com_google_android_filament_RenderableManager_nSetGeometryAt__JIIIII(JNIEnv*, jclass, - jlong nativeRenderableManager, jint i, jint primitiveIndex, jint primitiveType, jint offset, - jint count) { - RenderableManager *rm = (RenderableManager *) nativeRenderableManager; - rm->setGeometryAt((RenderableManager::Instance) i, (size_t) primitiveIndex, - (RenderableManager::PrimitiveType) primitiveType, (size_t) offset, (size_t) count); -} - extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_RenderableManager_nSetBlendOrderAt(JNIEnv*, jclass, jlong nativeRenderableManager, jint i, jint primitiveIndex, jint blendOrder) { diff --git a/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java b/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java index 7446246cc2..ddb2cce5ca 100644 --- a/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java +++ b/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java @@ -806,17 +806,7 @@ public class RenderableManager { 0, indices.getIndexCount()); } - /** - * Changes the geometry for the given primitive. - * - * @see Builder#geometry Builder.geometry - */ - public void setGeometryAt(@EntityInstance int i, @IntRange(from = 0) int primitiveIndex, - @NonNull PrimitiveType type, @IntRange(from = 0) int offset, @IntRange(from = 0) int count) { - nSetGeometryAt(mNativeObject, i, primitiveIndex, type.getValue(), offset, count); - } - - /** + /** * Changes the drawing order for blended primitives. The drawing order is either global or * local (default) to this Renderable. In either case, the Renderable priority takes precedence. * @@ -921,7 +911,6 @@ public class RenderableManager { private static native void nSetMaterialInstanceAt(long nativeRenderableManager, int i, int primitiveIndex, long nativeMaterialInstance); private static native long nGetMaterialInstanceAt(long nativeRenderableManager, int i, int primitiveIndex); private static native void nSetGeometryAt(long nativeRenderableManager, int i, int primitiveIndex, int primitiveType, long nativeVertexBuffer, long nativeIndexBuffer, int offset, int count); - private static native void nSetGeometryAt(long nativeRenderableManager, int i, int primitiveIndex, int primitiveType, int offset, int count); private static native void nSetBlendOrderAt(long nativeRenderableManager, int i, int primitiveIndex, int blendOrder); private static native void nSetGlobalBlendOrderEnabledAt(long nativeRenderableManager, int i, int primitiveIndex, boolean enabled); private static native int nGetEnabledAttributesAt(long nativeRenderableManager, int i, int primitiveIndex); diff --git a/filament/include/filament/RenderableManager.h b/filament/include/filament/RenderableManager.h index 9f4817a406..6e24a28376 100644 --- a/filament/include/filament/RenderableManager.h +++ b/filament/include/filament/RenderableManager.h @@ -600,14 +600,6 @@ public: PrimitiveType type, VertexBuffer* vertices, IndexBuffer* indices, size_t offset, size_t count) noexcept; - /** - * Changes the active range of indices or topology for the given primitive. - * - * \see Builder::geometry() - */ - void setGeometryAt(Instance instance, size_t primitiveIndex, - PrimitiveType type, size_t offset, size_t count) noexcept; - /** * Changes the drawing order for blended primitives. The drawing order is either global or * local (default) to this Renderable. In either case, the Renderable priority takes precedence. diff --git a/filament/src/RenderableManager.cpp b/filament/src/RenderableManager.cpp index f49697eed3..c99eab986a 100644 --- a/filament/src/RenderableManager.cpp +++ b/filament/src/RenderableManager.cpp @@ -118,11 +118,6 @@ void RenderableManager::setGeometryAt(Instance instance, size_t primitiveIndex, type, upcast(vertices), upcast(indices), offset, count); } -void RenderableManager::setGeometryAt(RenderableManager::Instance instance, size_t primitiveIndex, - RenderableManager::PrimitiveType type, size_t offset, size_t count) noexcept { - upcast(this)->setGeometryAt(instance, 0, primitiveIndex, type, offset, count); -} - void RenderableManager::setBones(Instance instance, RenderableManager::Bone const* transforms, size_t boneCount, size_t offset) { upcast(this)->setBones(instance, transforms, boneCount, offset); diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp index 7b92ef3105..45373f7159 100644 --- a/filament/src/components/RenderableManager.cpp +++ b/filament/src/components/RenderableManager.cpp @@ -579,16 +579,6 @@ void FRenderableManager::setGeometryAt(Instance instance, uint8_t level, size_t } } -void FRenderableManager::setGeometryAt(Instance instance, uint8_t level, size_t primitiveIndex, - PrimitiveType type, size_t offset, size_t count) noexcept { - if (instance) { - Slice& primitives = getRenderPrimitives(instance, level); - if (primitiveIndex < primitives.size()) { - primitives[primitiveIndex].set(mEngine, type, offset, 0, 0, count); - } - } -} - void FRenderableManager::setBones(Instance ci, Bone const* UTILS_RESTRICT transforms, size_t boneCount, size_t offset) { if (ci) { diff --git a/filament/src/components/RenderableManager.h b/filament/src/components/RenderableManager.h index 149480f0ac..326360b67c 100644 --- a/filament/src/components/RenderableManager.h +++ b/filament/src/components/RenderableManager.h @@ -165,8 +165,6 @@ public: void setGeometryAt(Instance instance, uint8_t level, size_t primitiveIndex, PrimitiveType type, FVertexBuffer* vertices, FIndexBuffer* indices, size_t offset, size_t count) noexcept; - void setGeometryAt(Instance instance, uint8_t level, size_t primitiveIndex, - PrimitiveType type, size_t offset, size_t count) noexcept; void setBlendOrderAt(Instance instance, uint8_t level, size_t primitiveIndex, uint16_t blendOrder) noexcept; void setGlobalBlendOrderEnabledAt(Instance instance, uint8_t level, size_t primitiveIndex, bool enabled) noexcept; AttributeBitset getEnabledAttributesAt(Instance instance, uint8_t level, size_t primitiveIndex) const noexcept; diff --git a/web/filament-js/filament.d.ts b/web/filament-js/filament.d.ts index 1b82b31660..2d670049fd 100644 --- a/web/filament-js/filament.d.ts +++ b/web/filament-js/filament.d.ts @@ -319,8 +319,6 @@ export class RenderableManager { public setGeometryAt(instance: RenderableManager$Instance, primitiveIndex: number, type: RenderableManager$PrimitiveType, vertices: VertexBuffer, indices: IndexBuffer, offset: number, count: number): void; - public setGeometryRangeAt(instance: RenderableManager$Instance, primitiveIndex: number, - type: RenderableManager$PrimitiveType, offset: number, count: number): void; public setBlendOrderAt(instance: RenderableManager$Instance, primitiveIndex: number, order: number): void; public getEnabledAttributesAt(instance: RenderableManager$Instance, diff --git a/web/filament-js/jsbindings.cpp b/web/filament-js/jsbindings.cpp index 631ddcca99..28e041c370 100644 --- a/web/filament-js/jsbindings.cpp +++ b/web/filament-js/jsbindings.cpp @@ -1000,12 +1000,6 @@ class_("RenderableManager") self->setGeometryAt(instance, primitiveIndex, type, vertices, indices, offset, count); }), allow_raw_pointers()) - .function("setGeometryRangeAt", EMBIND_LAMBDA(void, (RenderableManager* self, - RenderableManager::Instance instance, size_t primitiveIndex, - RenderableManager::PrimitiveType type, size_t offset, size_t count), { - self->setGeometryAt(instance, primitiveIndex, type, offset, count); - }), allow_raw_pointers()) - .function("setBlendOrderAt", &RenderableManager::setBlendOrderAt) .function("setGlobalBlendOrderEnabledAt", &RenderableManager::setGlobalBlendOrderEnabledAt)