@luma.gl/webgl 9.0.0-alpha.5 → 9.0.0-alpha.6

package/src/context/parameters/unified-parameter-api.ts

@@ -21,7 +21,10 @@ export type {GLParameters};
  * @note requires a `cache` object to be set on the context (gl.state.cache)
  * This object is used to fill in any missing values for composite setter functions
  */
-export function setParameters(device: Device | WebGLRenderingContext, parameters: GLParameters): void {
+export function setParameters(
+  device: Device | WebGLRenderingContext,
+  parameters: GLParameters
+): void {
   const webglDevice = WebGLDevice.attach(device);
   const gl = webglDevice.gl;
 
@@ -74,7 +77,10 @@ export function setParameters(device: Device | WebGLRenderingContext, parameters
 
 /**
  * Reads the entire WebGL state from a context
- * @returns - a newly created map, with values keyed by GL parameters
+
+  // default to querying all parameters
+
+  * @returns - a newly created map, with values keyed by GL parameters
  *
  * @note Copies the state from a context (gl.getParameter should not be overriden)
  * Reads the entire WebGL state from a context
@@ -83,13 +89,10 @@ export function setParameters(device: Device | WebGLRenderingContext, parameters
  * considered a very slow operation, to be used only if/when a context already manipulated
  * by external code needs to be synchronized for the first time
  */
-export function getParameters(gl: WebGLRenderingContext, parameters?: Record<keyof GLParameters, any>): GLParameters;
-export function getParameters(gl: WebGLRenderingContext, parameters?: (keyof GLParameters)[]): GLParameters;
-export function getParameters(gl: WebGLRenderingContext, parameters: keyof GLParameters): GLParameters;
-
-export function getParameters(gl, parameters) {
-  // default to querying all parameters
-  parameters = parameters || GL_PARAMETER_DEFAULTS;
+export function getParameters(
+  gl: WebGLRenderingContext,
+  parameters: keyof GLParameters | (keyof GLParameters)[] | GLParameters = GL_PARAMETER_DEFAULTS
+): GLParameters {
   // support both arrays of parameters and objects (keys represent parameters)
 
   if (typeof parameters === 'number') {

package/src/context/polyfill/polyfill-context.ts

@@ -65,7 +65,7 @@ function polyfillExtension(gl: WebGLRenderingContext, {extension, target, target
   for (const key of Object.keys(defaults)) {
     const extKey = `${key}${suffix}`;
 
-    let polyfill = null;
+    let polyfill: Function | null = null;
     if (key === 'meta') {
       // ignore
     } else if (typeof gl[key] === 'function') {

package/src/context/polyfill/polyfill-table.ts

@@ -81,7 +81,7 @@ export const WEBGL2_CONTEXT_POLYFILLS = {
     getQueryParameter(handle, pname) {
       return this.getQueryObject(handle, pname);
     },
-    getQueryObject: () => {}
+    getQueryObject: (handle: unknown, pname: unknown) => {}
   }
 };
 

package/src/context/state-tracker/track-context-state.ts

@@ -54,7 +54,7 @@ class GLState {
     let valueChanged = false;
     let oldValue; // = undefined
 
-    const oldValues: {[key: number | string]: any} = this.stateStack.length > 0 && this.stateStack[this.stateStack.length - 1];
+    const oldValues: {[key: number | string]: any} | null = this.stateStack.length > 0 ? this.stateStack[this.stateStack.length - 1] : null;
 
     for (const key in values) {
       assert(key !== undefined);

package/src/index.ts

@@ -8,13 +8,14 @@
 import '@luma.gl/api';
 import './init'
 
+// Types
+export type {WebGLLimits} from './adapter/device-helpers/device-limits';
+
+// WebGL adapter classes
 export {default as WebGLDevice} from './adapter/webgl-device';
 export {default as WebGLCanvasContext} from './adapter/webgl-canvas-context';
 
-// Legacy WebGL Classes - will be moved to gltools
-export {default as Accessor} from './classic/accessor';
-export type {ClassicBufferProps as BufferProps} from './classic/buffer';
-export {default as Buffer} from './classic/buffer';
+// WebGL Resource classes
 export {default as WEBGLResource, default as WebGLResource} from './adapter/objects/webgl-resource';
 export {default as WEBGLBuffer} from './adapter/resources/webgl-buffer';
 export {default as WEBGLTexture} from './adapter/resources/webgl-texture';
@@ -24,16 +25,21 @@ export {default as WEBGLSampler} from './adapter/resources/webgl-sampler';
 export {default as WEBGLFramebuffer} from './adapter/resources/webgl-framebuffer';
 
 export {default as WEBGLRenderPipeline} from './adapter/resources/webgl-render-pipeline';
-
 // export {default as WEBGLComputePipeline} from './adapter/resources/webgl-compute-pipeline';
 export {default as WEBGLCommandEncoder} from './adapter/resources/webgl-command-encoder';
 export {default as WEBGLRenderPass} from './adapter/resources/webgl-render-pass';
 //export {default as WEBGLComputePass} from './adapter/resources/webgl-compute-pass';
 
+// non-api resources
 export type {RenderbufferProps} from './adapter/objects/webgl-renderbuffer';
 export {default as WEBGLRenderbuffer} from './adapter/objects/webgl-renderbuffer';
 export {default as WEBGLVertexArrayObject} from './adapter/objects/webgl-vertex-array-object';
 
+// WebGL adapter classes (Legacy, will be moved to gltools)
+export {default as Accessor} from './classic/accessor';
+export type {ClassicBufferProps, ClassicBufferProps as BufferProps} from './classic/buffer';
+export {default as ClassicBuffer, default as Buffer} from './classic/buffer';
+
 export {
   isWebGL,
   isWebGL2,

package/src/types/webgl.ts

@@ -120,7 +120,7 @@ export type GLStencilOp =
   | GL.INVERT;
 
 /** Parameters for textures and samplers */
-export type WebGLSamplerParameters = {
+export type GLSamplerParameters = {
   [GL.TEXTURE_WRAP_S]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
   [GL.TEXTURE_WRAP_T]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
   [GL.TEXTURE_WRAP_R]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
@@ -281,4 +281,4 @@ export type GLFunctionParameters = {
 };
 
 /** WebGL style parameters object (with both GL constants and function style fields) */
-export type GLParameters = GLValueParameters | GLFunctionParameters;
+export type GLParameters = GLValueParameters & GLFunctionParameters;