From 36b3cc7bf0c41bbe2c097c0573685bec281f2e7d Mon Sep 17 00:00:00 2001
From: Mingwei Samuel <mingwei.samuel@gmail.com>
Date: Fri, 17 Jul 2020 17:13:38 -0700
Subject: [PATCH] Filament.d.ts: add Vector<T> interface, vectorToArray<T> fn,
 fix getResourceUris() return vec

---
 web/filament-js/filament.d.ts | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/web/filament-js/filament.d.ts b/web/filament-js/filament.d.ts
index af3b294f36..f41cfdf6a7 100644
--- a/web/filament-js/filament.d.ts
+++ b/web/filament-js/filament.d.ts
@@ -46,6 +46,14 @@ export type mat3 = glm.mat3|number[];
 export type mat4 = glm.mat4|number[];
 export type quat = glm.quat|number[];
 
+/** A C++ std::vector. */
+export interface Vector<T> {
+    size(): number;
+    get(i: number): T;
+}
+
+export function vectorToArray<T>(vector: Vector<T>): T[];
+
 export class Texture {}
 export class SwapChain {}
 
@@ -98,16 +106,6 @@ export class Entity {
     public getId(): number;
 }
 
-export class EntityVector {
-    public get(index: number): Entity;
-    public size(): number;
-}
-
-export class MaterialInstanceVector {
-    public get(index: number): MaterialInstance;
-    public size(): number;
-}
-
 export class Skybox {
     public setColor(color: float4): void;
 }
@@ -489,8 +487,8 @@ export class gltfio$FilamentAsset {
     public getCameraEntities(): Entity[];
     public getRoot(): Entity;
     public popRenderable(): Entity;
-    public getMaterialInstances(): MaterialInstanceVector;
-    public getResourceUris(): string[];
+    public getMaterialInstances(): Vector<MaterialInstance>;
+    public getResourceUris(): Vector<string>;
     public getBoundingBox(): Aabb;
     public getName(entity: Entity): string;
     public getAnimator(): gltfio$Animator;
@@ -500,7 +498,7 @@ export class gltfio$FilamentAsset {
 }
 
 export class gltfio$FilamentInstance {
-    public getEntities(): EntityVector;
+    public getEntities(): Vector<Entity>;
     public getRoot(): Entity;
     public getAnimator(): gltfio$Animator;
 }