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

remove RenderManager::setGeometryAt() that only sets offset/count

Browse Source 
This is an API breakage, but the "full" setGeometryAt() can usually be 
used instead.
This commit is contained in:
Mathias Agopian
2022-06-01 12:46:45 -07:00
committed by Mathias Agopian
parent f85103af9d
commit cc7d88c033
8 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/filament-android/src/main/cpp/RenderableManager.cpp
-9
View File
@@ -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) {
android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
+1 -12
View File
@@ -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);
filament/include/filament/RenderableManager.h
-8
View File
@@ -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.
filament/src/RenderableManager.cpp
-5
View File
@@ -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);
filament/src/components/RenderableManager.cpp
-10
View File
@@ -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<FRenderPrimitive>& 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) {
filament/src/components/RenderableManager.h
-2
View File
@@ -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;
web/filament-js/filament.d.ts
Vendored
-2
View File
@@ -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,
web/filament-js/jsbindings.cpp
-6
View File
@@ -1000,12 +1000,6 @@ class_<RenderableManager>("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)