From d99f9cffb26bda3df400ef1bf607b130d8caa39e Mon Sep 17 00:00:00 2001 From: Logan Lawrence Date: Tue, 7 Apr 2020 11:45:29 -0600 Subject: [PATCH] GEOSP-97 Added javascript binding --- web/filament-js/filament.d.ts | 2 ++ web/filament-js/jsbindings.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/web/filament-js/filament.d.ts b/web/filament-js/filament.d.ts index a4547614a5..13b7497534 100644 --- a/web/filament-js/filament.d.ts +++ b/web/filament-js/filament.d.ts @@ -143,6 +143,8 @@ export class RenderableManager$Builder { ib: IndexBuffer): RenderableManager$Builder; public geometryOffset(slot: number, ptype: RenderableManager$PrimitiveType, vb: VertexBuffer, ib: IndexBuffer, offset: number, count: number): RenderableManager$Builder; + public geometryMinMax(slot: number, ptype: RenderableManager$PrimitiveType, vb: VertexBuffer, + ib: IndexBuffer, offset: number, minIndex: number, maxIndex: number, count: number): RenderableManager$Builder; public material(geo: number, minstance: MaterialInstance): RenderableManager$Builder; public boundingBox(box: Box): RenderableManager$Builder; public layerMask(select: number, values: number): RenderableManager$Builder; diff --git a/web/filament-js/jsbindings.cpp b/web/filament-js/jsbindings.cpp index 32e3df743e..39bb064443 100644 --- a/web/filament-js/jsbindings.cpp +++ b/web/filament-js/jsbindings.cpp @@ -650,6 +650,17 @@ class_("RenderableManager$Builder") size_t count), { return &builder->geometry(index, type, vertices, indices, offset, count); }) + .BUILDER_FUNCTION("geometryMinMax", RenderableBuilder, (RenderableBuilder* builder, + size_t index, + RenderableManager::PrimitiveType type, + VertexBuffer* vertices, + IndexBuffer* indices, + size_t offset, + size_t minIndex, + size_t maxIndex, + size_t count), { + return &builder->geometry(index, type, vertices, indices, offset, minIndex, maxIndex, count); }) + .BUILDER_FUNCTION("material", RenderableBuilder, (RenderableBuilder* builder, size_t index, MaterialInstance* mi), { return &builder->material(index, mi); })