fix: remove unnecessary optional

iTowns · Jan 23, 2025 · 853fc75 · 853fc75
1 parent a9b5ac8
commit 853fc75
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/Core/Prefab/TileBuilder.ts b/src/Core/Prefab/TileBuilder.ts
@@ -100,11 +100,19 @@ export function newTileGeometry(
 
         let buffers;
         try {
-            buffers = computeBuffers(builder, params,
-                cachedBuffers !== undefined ? {
-                    index: cachedBuffers.index.array as Uint32Array,
-                    uv: cachedBuffers.uv.array as Float32Array,
-                } : undefined);
+            buffers = computeBuffers(
+                builder,
+                params,
+                // @ts-expect-error: can't sync index type right now
+                cachedBuffers !== undefined
+                    ? {
+                        // We lost type information along the way with the
+                        // storage as THREE.BufferAttribute.
+                        index: cachedBuffers.index.array,
+                        uv: cachedBuffers.uv.array as Float32Array,
+                    }
+                    : undefined,
+            );
         } catch (e) {
             return Promise.reject(e);
         }

diff --git a/src/Core/Prefab/computeBufferTileGeometry.ts b/src/Core/Prefab/computeBufferTileGeometry.ts
@@ -50,7 +50,7 @@ function allocateIndexBuffer(
     nSeg: number,
     params: TileBuilderParams,
     cache?: BufferCache['index'],
-): Option<{ index: IndexArray, skirt: IndexArray }> {
+): { index: IndexArray, skirt: IndexArray } {
     const indexBufferSize = getBufferIndexSize(nSeg, params.disableSkirt);
     const indexConstructor = getUintArrayConstructor(nVertex);
 
@@ -89,7 +89,7 @@ function allocateBuffers(
     const {
         index,
         skirt,
-    } = allocateIndexBuffer(nVertex, nSeg, params, cache?.index) ?? {};
+    } = allocateIndexBuffer(nVertex, nSeg, params, cache?.index);
 
     return {
         index,