@luma.gl/core 9.0.11 → 9.1.0-alpha.1

package/src/{adapter/attribute-utils → adapter-utils}/get-attribute-from-layouts.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {log} from '../../utils/log';
-import type {ShaderLayout, AttributeDeclaration} from '../types/shader-layout';
-import type {BufferLayout} from '../types/buffer-layout';
-import type {ShaderDataType, ShaderAttributeType} from '../types/shader-types';
-import {decodeShaderAttributeType} from '../type-utils/decode-attribute-type';
-import type {VertexFormat, VertexType} from '../types/vertex-formats';
-import {decodeVertexFormat} from '../type-utils/decode-vertex-format';
+import {log} from '../utils/log';
+import type {ShaderLayout, AttributeDeclaration} from '../adapter/types/shader-layout';
+import type {BufferLayout} from '../adapter/types/buffer-layout';
+import type {ShaderDataType, ShaderAttributeType} from '../gpu-type-utils/shader-types';
+import {decodeShaderAttributeType} from '../gpu-type-utils/decode-attribute-type';
+import type {VertexFormat, VertexType} from '../gpu-type-utils/vertex-formats';
+import {decodeVertexFormat} from '../gpu-type-utils/decode-vertex-format';
 
 /** Resolved info for a buffer / attribute combination to help backend configure it correctly */
 export type AttributeInfo = {
@@ -64,11 +64,10 @@ export function getAttributeInfosFromLayouts(
 ): Record<string, AttributeInfo> {
   const attributeInfos: Record<string, AttributeInfo> = {};
   for (const attribute of shaderLayout.attributes) {
-    attributeInfos[attribute.name] = getAttributeInfoFromLayouts(
-      shaderLayout,
-      bufferLayout,
-      attribute.name
-    );
+    const attributeInfo = getAttributeInfoFromLayouts(shaderLayout, bufferLayout, attribute.name);
+    if (attributeInfo) {
+      attributeInfos[attribute.name] = attributeInfo;
+    }
   }
   return attributeInfos;
 }
@@ -98,7 +97,10 @@ function getAttributeInfoFromLayouts(
   name: string
 ): AttributeInfo | null {
   const shaderDeclaration = getAttributeFromShaderLayout(shaderLayout, name);
-  const bufferMapping: BufferAttributeInfo = getAttributeFromBufferLayout(bufferLayout, name);
+  const bufferMapping: BufferAttributeInfo | null = getAttributeFromBufferLayout(
+    bufferLayout,
+    name
+  );
 
   // TODO should no longer happen
   if (!shaderDeclaration) {
@@ -124,7 +126,7 @@ function getAttributeInfoFromLayouts(
     normalized: vertexFormatInfo.normalized,
     // integer is a property of the shader declaration
     integer: attributeTypeInfo.integer,
-    stepMode: bufferMapping?.stepMode || shaderDeclaration.stepMode,
+    stepMode: bufferMapping?.stepMode || shaderDeclaration.stepMode || 'vertex',
     byteOffset: bufferMapping?.byteOffset || 0,
     byteStride: bufferMapping?.byteStride || 0
   };
@@ -211,6 +213,7 @@ function getAttributeFromAttributesList(
     if (typeof bufferLayout.byteStride !== 'number') {
       for (const attributeMapping of bufferLayout.attributes || []) {
         const info = decodeVertexFormat(attributeMapping.format);
+        // @ts-ignore
         byteStride += info.byteLength;
       }
     }
@@ -223,6 +226,7 @@ function getAttributeFromAttributesList(
         stepMode: bufferLayout.stepMode,
         vertexFormat: attributeMapping.format,
         byteOffset: attributeMapping.byteOffset,
+        // @ts-ignore
         byteStride
       };
     }
@@ -230,31 +234,3 @@ function getAttributeFromAttributesList(
 
   return null;
 }
-
-/**
- * Merges an provided shader layout into a base shader layout
- * In WebGL, this allows the auto generated shader layout to be overridden by the application
- * Typically to change the format of the vertex attributes (from float32x4 to uint8x4 etc).
- * @todo Drop this? Aren't all use cases covered by mergeBufferLayout()?
- */
-export function mergeShaderLayout(
-  baseLayout: ShaderLayout,
-  overrideLayout: ShaderLayout
-): ShaderLayout {
-  // Deep clone the base layout
-  const mergedLayout: ShaderLayout = {
-    ...baseLayout,
-    attributes: baseLayout.attributes.map(attribute => ({...attribute}))
-  };
-  // Merge the attributes
-  for (const attribute of overrideLayout?.attributes || []) {
-    const baseAttribute = mergedLayout.attributes.find(attr => attr.name === attribute.name);
-    if (!baseAttribute) {
-      log.warn(`shader layout attribute ${attribute.name} not present in shader`);
-    } else {
-      baseAttribute.type = attribute.type || baseAttribute.type;
-      baseAttribute.stepMode = attribute.stepMode || baseAttribute.stepMode;
-    }
-  }
-  return mergedLayout;
-}

package/src/adapter-utils/is-uniform-value.ts

@@ -0,0 +1,10 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {isNumberArray} from '../utils/is-array';
+import {UniformValue} from '../adapter/types/uniforms';
+
+export function isUniformValue(value: unknown): value is UniformValue {
+  return isNumberArray(value) || typeof value === 'number' || typeof value === 'boolean';
+}

package/src/{adapter/type-utils → gpu-type-utils}/decode-attribute-type.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ShaderDataType, ShaderAttributeType} from '../types/shader-types';
-import {VertexFormat, VertexType} from '../types/vertex-formats';
+import {ShaderDataType, ShaderAttributeType} from './shader-types';
+import {VertexFormat, VertexType} from './vertex-formats';
 
 /** Information extracted from a ShaderAttributeInfo constant */
 export type ShaderAttributeTypeInfo = {
@@ -18,7 +18,7 @@ export type ShaderAttributeTypeInfo = {
   /** Whether this data type is signed */
   signed: boolean;
   /** The simplest vertex format that matches the shader attribute's data type */
-  defaultVertexFormat?: VertexFormat;
+  defaultVertexFormat: VertexFormat;
 };
 
 /** Decodes a vertex type, returning byte length and flags (integer, signed, normalized) */

package/src/{adapter/type-utils → gpu-type-utils}/decode-data-type.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {DataType, NormalizedDataType} from '../types/vertex-formats';
+import {DataType, NormalizedDataType} from './vertex-formats';
 
 export type DecodedVertexType = {
   /** WebGPU data type */

package/src/{adapter/type-utils → gpu-type-utils}/decode-shader-types.ts

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {assert} from '../../utils/assert';
-import {ShaderUniformType, ShaderDataType} from '../types/shader-types';
+import {ShaderUniformType, ShaderDataType} from './shader-types';
 
 const UNIFORM_FORMATS: Record<ShaderUniformType, {type: ShaderDataType; components: number}> = {
   f32: {type: 'f32', components: 1},
@@ -36,7 +35,6 @@ export function decodeShaderUniformType(format: ShaderUniformType): {
   components: number;
 } {
   const decoded = UNIFORM_FORMATS[format];
-  assert(format);
   return decoded;
 }
 

package/src/{adapter/type-utils → gpu-type-utils}/decode-texture-format.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {TextureFormat} from '../types/texture-formats';
-import {VertexType} from '../types/vertex-formats';
+import {TextureFormat} from './texture-formats';
+import {VertexType} from './vertex-formats';
 import {decodeVertexType} from './decode-data-type';
 
 // prettier-ignore

package/src/{adapter/type-utils → gpu-type-utils}/decode-vertex-format.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {VertexFormat, VertexType} from '../types/vertex-formats';
+import {VertexFormat, VertexType} from './vertex-formats';
 import {decodeVertexType} from './decode-data-type';
 
 export type VertexFormatInfo = {

package/src/{adapter/types → gpu-type-utils}/texture-formats.ts

@@ -139,7 +139,7 @@ export type UnsizedColorTextureFormat = 'rgb8unorm-unsized' | 'rgba8unorm-unsize
 // 'rgb8unorm-srgb-unsized' |
 // 'rgba8unorm-srgb-unsized'
 
-/** Sized formats unique to WebGL 2. Some will perhaps be added to WebGPU standard? */
+/** Sized formats in WebGL 2 that are not (yet?) supported by WebGPU */
 export type WebGL2ColorTextureFormat =
   | 'r16unorm-webgl'
   | 'r16snorm-webgl'

package/src/{adapter/type-utils → gpu-type-utils}/vertex-format-from-attribute.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {TypedArray, TypedArrayConstructor} from '../../types';
-import {VertexFormat} from '../types/vertex-formats';
+import {TypedArray, TypedArrayConstructor} from '../types';
+import {VertexFormat} from './vertex-formats';
 
 // import {DataType} from '../types/vertex-formats';
 // type Omit<DataType, 'float16'> unfortunately breaks Typescript inferance

package/src/{adapter/type-utils → gpu-type-utils}/wgsl-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ShaderAttributeType} from '../types/shader-types';
+import {ShaderAttributeType} from './shader-types';
 
 /**  Predeclared aliases @see https://www.w3.org/TR/WGSL/#vector-types */
 export const WGSL_TYPE_ALIAS_MAP: Record<string, ShaderAttributeType> = {

package/src/index.ts

@@ -4,19 +4,13 @@
 
 export {VERSION} from './init';
 
-// GENERAL TYPES
-export type {ConstructorOf, PartialBy} from './types';
-
-// NUMERIC TYPES - TODO: could be imported from @math.gl/types
-export type {TypedArray, TypedArrayConstructor, NumberArray, BigIntOrNumberArray} from './types';
-
-export {isTypedArray, isNumberArray} from './utils/is-array';
-
-// MAIN API ACCESS POINTS
-export {luma} from './lib/luma';
+// MAIN API ACCESS POINT
+export {luma} from './adapter/luma';
 
+// ADAPTER (DEVICE AND GPU RESOURCE INTERFACES)
 export type {DeviceProps, DeviceInfo, DeviceFeature} from './adapter/device';
 export {Device, DeviceFeatures, DeviceLimits} from './adapter/device';
+
 export type {CanvasContextProps} from './adapter/canvas-context';
 export {CanvasContext} from './adapter/canvas-context';
 
@@ -27,7 +21,7 @@ export {Resource} from './adapter/resources/resource';
 export type {BufferProps} from './adapter/resources/buffer';
 export {Buffer} from './adapter/resources/buffer';
 
-export type {TextureProps, TextureData} from './adapter/resources/texture';
+export type {TextureProps} from './adapter/resources/texture';
 export {Texture} from './adapter/resources/texture';
 
 export type {TextureViewProps} from './adapter/resources/texture-view';
@@ -72,12 +66,32 @@ export {TransformFeedback} from './adapter/resources/transform-feedback';
 export type {QuerySetProps} from './adapter/resources/query-set';
 export {QuerySet} from './adapter/resources/query-set';
 
+// PORTABLE API - UNIFORM BUFFERS
+export {UniformBufferLayout} from './portable/uniform-buffer-layout';
+export {UniformBlock} from './portable/uniform-block';
+export {UniformStore} from './portable/uniform-store';
+// TEXTURE TYPES
+
 // API TYPES
-export type {AccessorObject} from './adapter/types/accessor';
+export type {CompilerMessage} from './adapter/types/compiler-message';
+
+export type {
+  TextureCompressionFormat,
+  TextureCubeFace,
+  TextureLevelData,
+  ExternalImage,
+  TextureData,
+  Texture1DData,
+  Texture2DData,
+  Texture3DData,
+  TextureCubeData,
+  TextureArrayData,
+  TextureCubeArrayData
+} from './adapter/resources/texture';
+
+export type {Parameters, PrimitiveTopology, IndexFormat} from './adapter/types/parameters';
+
 export type {
-  Parameters,
-  PrimitiveTopology,
-  IndexFormat,
   CullMode,
   FrontFace,
   RasterizationParameters,
@@ -94,20 +108,7 @@ export type {
   ProvokingVertex
 } from './adapter/types/parameters';
 
-// MEMORY LAYOUT TYPES
-export type {VertexFormat, VertexType} from './adapter/types/vertex-formats';
-export type {
-  TextureFormat,
-  ColorTextureFormat,
-  DepthStencilTextureFormat
-} from './adapter/types/texture-formats';
-export type {
-  ShaderDataType,
-  ShaderAttributeType,
-  ShaderUniformType
-} from './adapter/types/shader-types';
-
-export type {ColorAttachment, DepthStencilAttachment} from './adapter/types/types';
+export type {ColorAttachment, DepthStencilAttachment} from './adapter/types/attachments';
 
 export type {
   ShaderLayout,
@@ -125,63 +126,40 @@ export type {
   VaryingBinding
 } from './adapter/types/shader-layout';
 
-export type {UniformValue} from './adapter/types/types';
-export {UniformBufferLayout} from './lib/uniforms/uniform-buffer-layout';
-export {UniformBlock} from './lib/uniforms/uniform-block';
-export {UniformStore} from './lib/uniforms/uniform-store';
-
-// TYPE UTILS
-export {decodeVertexFormat} from './adapter/type-utils/decode-vertex-format';
-export {decodeTextureFormat} from './adapter/type-utils/decode-texture-format';
-export {
-  getDataTypeFromTypedArray,
-  getTypedArrayFromDataType,
-  getVertexFormatFromAttribute
-} from './adapter/type-utils/vertex-format-from-attribute';
-
-// SHADER TYPE UTILS
-export {decodeShaderUniformType} from './adapter/type-utils/decode-shader-types';
-export {decodeShaderAttributeType} from './adapter/type-utils/decode-attribute-type';
-
-// COMPILER LOG
-export type {CompilerMessage} from './lib/compiler-log/compiler-message';
-export {formatCompilerLog} from './lib/compiler-log/format-compiler-log';
-
-//
-export type {AttributeInfo} from './adapter/attribute-utils/get-attribute-from-layouts';
-export {
-  getAttributeInfosFromLayouts,
-  mergeShaderLayout
-} from './adapter/attribute-utils/get-attribute-from-layouts';
-
-// GENERAL UTILS
-
-export {StatsManager} from './utils/stats-manager';
-export {assert} from './utils/assert';
-export {cast} from './utils/cast';
-export {log} from './utils/log';
-export {uid, isObjectEmpty} from './utils/utils';
-export {isUniformValue, splitUniformsAndBindings} from './lib/uniforms/uniform';
-export {formatValue} from './utils/format-value';
-export {stubRemovedMethods} from './utils/stub-methods';
-export {checkProps} from './utils/check-props';
-export {setPathPrefix, loadFile, loadImage, loadImageBitmap, loadScript} from './utils/load-file';
-export {getScratchArrayBuffer, getScratchArray, fillArray} from './utils/array-utils-flat';
-export {makeRandomNumberGenerator, random} from './utils/random';
-export {deepEqual} from './utils/deep-equal';
-
-// ENGINE - TODO/move to @luma.gl/engine once that module is webgl-independent?
-export {requestAnimationFrame, cancelAnimationFrame} from './utils/request-animation-frame';
-
-// SHADER HELPERS
-
-/**
- * Marks GLSL shaders for syntax highlighting: glsl`...`
- * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
- */
+export type {UniformValue} from './adapter/types/uniforms';
+
+// GPU TYPE UTILS - GPU MEMORY LAYOUT TYPES - EXTERNAL
+
+export type {NumberArray} from './types';
+export type {VertexFormat, VertexType} from './gpu-type-utils/vertex-formats';
+export type {
+  ShaderDataType,
+  ShaderAttributeType,
+  ShaderUniformType
+} from './gpu-type-utils/shader-types';
+export type {
+  TextureFormat,
+  ColorTextureFormat,
+  DepthStencilTextureFormat
+} from './gpu-type-utils/texture-formats';
+
+// GPU TYPE UTILS - GPU MEMORY LAYOUT HELPERS - CAN BE USED BY APPS BUT MOSTLY USED INTERNALLY
+
+export {decodeVertexFormat} from './gpu-type-utils/decode-vertex-format';
+export {decodeTextureFormat} from './gpu-type-utils/decode-texture-format';
+export {decodeShaderUniformType} from './gpu-type-utils/decode-shader-types';
+export {decodeShaderAttributeType} from './gpu-type-utils/decode-attribute-type';
+export {getDataTypeFromTypedArray} from './gpu-type-utils/vertex-format-from-attribute';
+export {getTypedArrayFromDataType} from './gpu-type-utils/vertex-format-from-attribute';
+export {getVertexFormatFromAttribute} from './gpu-type-utils/vertex-format-from-attribute';
+
+// GENERAL EXPORTS - FOR APPLICATIONS
+
+export type {StatsManager} from './utils/stats-manager'; // TODO - should this be moved to probe.gl?
+/** GLSL syntax highlighting: glsl`...` Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal */
 export const glsl = (x: TemplateStringsArray) => `${x}`;
 
-// INTERNAL
+// ADAPTER UTILS - for implementing Device adapters (@luma.gl/webgl and @luma.gl/webgpu)
 
 export type {
   CopyBufferToBufferOptions,
@@ -189,3 +167,10 @@ export type {
   CopyTextureToBufferOptions,
   CopyTextureToTextureOptions
 } from './adapter/resources/command-encoder';
+
+export type {AttributeInfo} from './adapter-utils/get-attribute-from-layouts';
+export {getAttributeInfosFromLayouts} from './adapter-utils/get-attribute-from-layouts';
+export {getScratchArrayBuffer, getScratchArray} from './utils/array-utils-flat';
+
+// INTERNAL UTILS - for use in other luma.gl modules only
+export {log} from './utils/log';

package/src/{lib/uniforms → portable}/uniform-block.ts

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {ShaderUniformType} from '../../adapter/types/shader-types';
-import type {UniformValue} from '../../adapter/types/types';
+import type {ShaderUniformType} from '../gpu-type-utils/shader-types';
+import type {UniformValue} from '../adapter/types/uniforms';
 import {
   ShaderLayout,
   UniformInfo,
   UniformBufferBindingLayout
-} from '../../adapter/types/shader-layout';
-import {arrayEqual, arrayCopy} from '../../utils/array-equal';
+} from '../adapter/types/shader-layout';
+import {arrayEqual, arrayCopy} from '../utils/array-equal';
 
 /**
  * A uniform block holds values of the of uniform values for one uniform block / buffer.
@@ -32,7 +32,7 @@ export class UniformBlock<
     shaderLayout?: ShaderLayout;
     uniformTypes?: Record<keyof TUniforms, Record<string, ShaderUniformType>>;
   }) {
-    this.name = props?.name;
+    this.name = props?.name || 'unnamed';
 
     // TODO - Extract uniform layout from the shaderLayout object
     if (props?.name && props?.shaderLayout) {

package/src/{lib/uniforms → portable}/uniform-buffer-layout.ts

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {ShaderUniformType, ShaderDataType} from '../../adapter/types/shader-types';
-import type {UniformValue} from '../../adapter/types/types';
-import {decodeShaderUniformType, alignTo} from '../../adapter/type-utils/decode-shader-types';
-import {getScratchArrayBuffer} from '../../utils/array-utils-flat';
-import {isNumberArray} from '../../utils/is-array';
-import {log} from '../../utils/log';
+import type {ShaderUniformType, ShaderDataType} from '../gpu-type-utils/shader-types';
+import {decodeShaderUniformType, alignTo} from '../gpu-type-utils/decode-shader-types';
+
+import type {UniformValue} from '../adapter/types/uniforms';
+import {getScratchArrayBuffer} from '../utils/array-utils-flat';
+import {isNumberArray} from '../utils/is-array';
+import {log} from '../utils/log';
 
 /**
  * Smallest buffer size that can be used for uniform buffers.
@@ -85,8 +86,7 @@ export class UniformBufferLayout {
         // single value -> just set it
         typedArray[offset] = Number(value);
       } else {
-        const numericArray = isNumberArray(value);
-        if (!numericArray) {
+        if (!isNumberArray(value)) {
           log.warn(
             `Supplied value for multi component / array uniform ${name} is not a numeric array: ${value}`
           )();
@@ -95,7 +95,7 @@ export class UniformBufferLayout {
         }
         // vector/matrix -> copy the supplied (typed) array, starting from offset
         // TODO: we should limit or check size in case the supplied data overflows
-        typedArray.set(numericArray, offset);
+        typedArray.set(value, offset);
       }
     }
 

package/src/{lib/uniforms → portable}/uniform-store.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {ShaderUniformType} from '../../adapter/types/shader-types';
-import type {UniformValue} from '../../adapter/types/types';
-import type {Device} from '../../adapter/device';
-import {Buffer} from '../../adapter/resources/buffer';
+import type {ShaderUniformType} from '../gpu-type-utils/shader-types';
+import type {UniformValue} from '../adapter/types/uniforms';
+import type {Device} from '../adapter/device';
+import {Buffer} from '../adapter/resources/buffer';
+import {log} from '../utils/log';
 import {UniformBlock} from './uniform-block';
 import {UniformBufferLayout} from './uniform-buffer-layout';
-import {log} from '../../utils/log';
 
 export type ShaderModuleInputs = {
   uniformTypes?: Record<string, ShaderUniformType>;
@@ -79,7 +79,7 @@ export class UniformStore<
     uniforms: Partial<{[group in keyof TPropGroups]: Partial<TPropGroups[group]>}>
   ): void {
     for (const [blockName, uniformValues] of Object.entries(uniforms)) {
-      this.uniformBlocks.get(blockName).setUniforms(uniformValues);
+      this.uniformBlocks.get(blockName)?.setUniforms(uniformValues);
       // We leverage logging in updateUniformBuffers(), even though slightly less efficient
       // this.updateUniformBuffer(blockName);
     }
@@ -89,13 +89,14 @@ export class UniformStore<
 
   /** Get the required minimum length of the uniform buffer */
   getUniformBufferByteLength(uniformBufferName: keyof TPropGroups): number {
-    return this.uniformBufferLayouts.get(uniformBufferName).byteLength;
+    return this.uniformBufferLayouts.get(uniformBufferName)?.byteLength || 0;
   }
 
   /** Get formatted binary memory that can be uploaded to a buffer */
   getUniformBufferData(uniformBufferName: keyof TPropGroups): Uint8Array {
-    const uniformValues = this.uniformBlocks.get(uniformBufferName).getAllUniforms();
-    return this.uniformBufferLayouts.get(uniformBufferName).getData(uniformValues);
+    const uniformValues = this.uniformBlocks.get(uniformBufferName)?.getAllUniforms() || {};
+    // @ts-ignore
+    return this.uniformBufferLayouts.get(uniformBufferName)?.getData(uniformValues);
   }
 
   /**
@@ -132,6 +133,7 @@ export class UniformStore<
       this.uniformBuffers.set(uniformBufferName, uniformBuffer);
     }
     // this.updateUniformBuffers();
+    // @ts-ignore
     return this.uniformBuffers.get(uniformBufferName);
   }
 
@@ -154,16 +156,16 @@ export class UniformStore<
     const uniformBuffer = this.uniformBuffers.get(uniformBufferName);
 
     let reason: false | string = false;
-    if (uniformBuffer && uniformBlock.needsRedraw) {
+    if (uniformBuffer && uniformBlock?.needsRedraw) {
       reason ||= uniformBlock.needsRedraw;
       // This clears the needs redraw flag
       const uniformBufferData = this.getUniformBufferData(uniformBufferName);
 
       const uniformBuffer = this.uniformBuffers.get(uniformBufferName);
-      uniformBuffer.write(uniformBufferData);
+      uniformBuffer?.write(uniformBufferData);
 
       // logging - TODO - don't query the values unnecessarily
-      const uniformValues = this.uniformBlocks.get(uniformBufferName).getAllUniforms();
+      const uniformValues = this.uniformBlocks.get(uniformBufferName)?.getAllUniforms();
       log.log(
         4,
         `Writing to uniform buffer ${String(uniformBufferName)}`,

package/src/types.ts

@@ -23,15 +23,3 @@ export type TypedArrayConstructor =
 export type BigIntTypedArray = BigInt64Array | BigUint64Array;
 
 export type BigIntOrNumberArray = NumberArray | BigIntTypedArray;
-
-/** Get the constructor type of a type */
-export interface ConstructorOf<T> {
-  new (...args: unknown[]): T;
-}
-
-/**
- * Make specific fields in a type optional. Granular version of `Partial<T>`
- * @example
- *  type PartialProps = PartialBy<Required<DeviceProps>, 'device' | 'canvas'>
- */
-export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/src/utils/array-equal.ts

@@ -9,12 +9,12 @@ export function arrayEqual(a: unknown, b: unknown, limit: number = 16) {
   if (a !== b) {
     return false;
   }
-  const arrayA = isNumberArray(a);
-  if (!arrayA) {
+  const arrayA = a;
+  const arrayB = b;
+  if (!isNumberArray(arrayA)) {
     return false;
   }
-  const arrayB = isNumberArray(b);
-  if (arrayB && arrayA.length === arrayB.length) {
+  if (isNumberArray(arrayB) && arrayA.length === arrayB.length) {
     for (let i = 0; i < arrayA.length; ++i) {
       if (arrayB[i] !== arrayA[i]) {
         return false;
@@ -26,9 +26,8 @@ export function arrayEqual(a: unknown, b: unknown, limit: number = 16) {
 
 /** Copy a value */
 export function arrayCopy<T>(a: T): T {
-  const numberArray = isNumberArray(a);
-  if (numberArray) {
-    return numberArray.slice() as T;
+  if (isNumberArray(a)) {
+    return a.slice() as T;
   }
   return a;
 }

package/src/utils/array-utils-flat.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {TypedArray, NumberArray} from '../types';
+import type {TypedArray} from '../types';
 
 let arrayBuffer: ArrayBuffer;
 
@@ -17,33 +17,3 @@ export function getScratchArray(Type: any, length: number): TypedArray {
   const scratchArrayBuffer = getScratchArrayBuffer(Type.BYTES_PER_ELEMENT * length);
   return new Type(scratchArrayBuffer, 0, length); // arrayBuffer, byteOffset, length (in elements)
 }
-
-// Uses copyWithin to significantly speed up typed array value filling
-export function fillArray(options: {
-  target: NumberArray;
-  source: NumberArray;
-  start?: number;
-  count?: number;
-}): NumberArray {
-  const {target, source, start = 0, count = 1} = options;
-  const length = source.length;
-  const total = count * length;
-  let copied = 0;
-  for (let i = start; copied < length; copied++) {
-    target[i++] = source[copied];
-  }
-
-  while (copied < total) {
-    // If we have copied less than half, copy everything we got
-    // else copy remaining in one operation
-    if (copied < total - copied) {
-      target.copyWithin(start + copied, start, start + copied);
-      copied *= 2;
-    } else {
-      target.copyWithin(start + copied, start, start + total - copied);
-      copied = total;
-    }
-  }
-
-  return options.target;
-}