@luma.gl/engine 8.6.0-alpha.5 → 9.0.0-alpha.11

package/src/transform/buffer-transform.ts

@@ -1,214 +0,0 @@
-import {assert} from '@luma.gl/api';
-import {Buffer, TransformFeedback, isWebGL2} from '@luma.gl/webgl';
-import type {TransformProps, TransformDrawOptions, TransformRunOptions, TransformBinding} from './transform-types';
-
-// import {TransformDrawOptions, TransformModelProps} from './resource-transform';
-// export interface BufferTransform2 {
-//   setupResources(opts: any): void;
-//   updateModelProps(props?: {}): TransformProps;
-//   getDrawOptions(opts?: {}): TransformDrawOptions;
-//   swap(): boolean;
-//   update(opts?: {}): void;
-//   getBuffer(varyingName: any): any;
-//   getData(options?: {varyingName: string}): any;
-//   delete(): void;
-// }
-
-export default class BufferTransform {
-  gl: WebGL2RenderingContext;
-  currentIndex = 0;
-  feedbackMap = {};
-  varyings: string[] | null = null; // varyings array
-  bindings: TransformBinding[] = [];
-  resources = {}; // resources to be deleted
-
-  constructor(gl: WebGL2RenderingContext, props: TransformProps = {}) {
-    this.gl = gl;
-    this._initialize(props);
-    Object.seal(this);
-  }
-
-  setupResources(opts): void {
-    for (const binding of this.bindings) {
-      this._setupTransformFeedback(binding, opts);
-    }
-  }
-
-  updateModelProps(props: TransformProps = {}): TransformProps {
-    const {varyings} = this;
-    if (varyings.length > 0) {
-      props = Object.assign({}, props, {varyings});
-    }
-    return props;
-  }
-
-  // @ts-expect-error
-  getDrawOptions(opts: TransformRunOptions = {}): TransformDrawOptions {
-    const binding = this.bindings[this.currentIndex];
-    const {sourceBuffers, transformFeedback} = binding;
-    // @ts-expect-error
-    const attributes = Object.assign({}, sourceBuffers, opts.attributes);
-    return {attributes, transformFeedback};
-  }
-
-  swap(): boolean {
-    if (this.feedbackMap) {
-      this.currentIndex = this._getNextIndex();
-      return true;
-    }
-    return false;
-  }
-
-  // update source and/or feedbackBuffers
-  update(opts = {}) {
-    this._setupBuffers(opts);
-  }
-
-  // returns current feedbackBuffer of given name
-  getBuffer(varyingName: string | null): Buffer | null {
-    const {feedbackBuffers} = this.bindings[this.currentIndex];
-    const bufferOrParams = varyingName ? feedbackBuffers[varyingName] : null;
-    if (!bufferOrParams) {
-      return null;
-    }
-    return bufferOrParams instanceof Buffer ? bufferOrParams : bufferOrParams.buffer;
-  }
-
-  getData(options: {varyingName?: string} = {}) {
-    const {varyingName} = options;
-    const buffer = this.getBuffer(varyingName);
-    if (buffer) {
-      return buffer.getData();
-    }
-    return null;
-  }
-
-  // Delete owned resources.
-  delete(): void {
-    for (const name in this.resources) {
-      this.resources[name].delete();
-    }
-  }
-
-  // Private
-
-  _initialize(props: TransformProps = {}): void {
-    this._setupBuffers(props);
-    this.varyings = props.varyings || Object.keys(this.bindings[this.currentIndex].feedbackBuffers);
-    if (this.varyings.length > 0) {
-      // if writting to buffers make sure it is WebGL2
-      assert(isWebGL2(this.gl));
-    }
-  }
-
-  // auto create feedback buffers if requested
-  _getFeedbackBuffers(props) {
-    const {sourceBuffers = {}} = props;
-    const feedbackBuffers = {};
-    if (this.bindings[this.currentIndex]) {
-      // this gurantees a partial feedback buffer set doesn't update
-      // previously set buffers during auto creation mode.
-      Object.assign(feedbackBuffers, this.bindings[this.currentIndex].feedbackBuffers);
-    }
-    if (this.feedbackMap) {
-      // feedbackMap is defined as sourceBuffer as key and feedbackBuffer name as object
-      for (const sourceName in this.feedbackMap) {
-        const feedbackName = this.feedbackMap[sourceName];
-        if (sourceName in sourceBuffers) {
-          feedbackBuffers[feedbackName] = sourceName;
-        }
-      }
-    }
-    Object.assign(feedbackBuffers, props.feedbackBuffers);
-    for (const bufferName in feedbackBuffers) {
-      const bufferOrRef = feedbackBuffers[bufferName];
-      if (typeof bufferOrRef === 'string') {
-        // Create new buffer with same layout and settings as source buffer
-        const sourceBuffer = sourceBuffers[bufferOrRef];
-        const {byteLength, usage, accessor} = sourceBuffer;
-        feedbackBuffers[bufferName] = this._createNewBuffer(bufferName, {
-          byteLength,
-          usage,
-          accessor
-        });
-      }
-    }
-
-    return feedbackBuffers;
-  }
-
-  _setupBuffers(props = {}) {
-  // @ts-expect-error
-  const {sourceBuffers = null} = props;
-  // @ts-expect-error
-  Object.assign(this.feedbackMap, props.feedbackMap);
-    const feedbackBuffers = this._getFeedbackBuffers(props);
-    this._updateBindings({sourceBuffers, feedbackBuffers});
-  }
-
-  _setupTransformFeedback(binding, {model}): void {
-    const {program} = model;
-    binding.transformFeedback = new TransformFeedback(this.gl, {
-      program,
-      buffers: binding.feedbackBuffers
-    });
-  }
-
-  _updateBindings(opts): void {
-    this.bindings[this.currentIndex] = this._updateBinding(this.bindings[this.currentIndex], opts);
-    if (this.feedbackMap) {
-      const {sourceBuffers, feedbackBuffers} = this._swapBuffers(this.bindings[this.currentIndex]);
-      const nextIndex = this._getNextIndex();
-      this.bindings[nextIndex] = this._updateBinding(this.bindings[nextIndex], {
-        sourceBuffers,
-        feedbackBuffers
-      });
-    }
-  }
-
-  _updateBinding(binding, opts) {
-    if (!binding) {
-      return {
-        sourceBuffers: Object.assign({}, opts.sourceBuffers),
-        feedbackBuffers: Object.assign({}, opts.feedbackBuffers)
-      };
-    }
-    Object.assign(binding.sourceBuffers, opts.sourceBuffers);
-    Object.assign(binding.feedbackBuffers, opts.feedbackBuffers);
-    if (binding.transformFeedback) {
-      binding.transformFeedback.setBuffers(binding.feedbackBuffers);
-    }
-    return binding;
-  }
-
-  _swapBuffers(opts): {sourceBuffers: any; feedbackBuffers: any} {
-    if (!this.feedbackMap) {
-      return null;
-    }
-    const sourceBuffers = Object.assign({}, opts.sourceBuffers);
-    const feedbackBuffers = Object.assign({}, opts.feedbackBuffers);
-    for (const srcName in this.feedbackMap) {
-      const dstName = this.feedbackMap[srcName];
-      sourceBuffers[srcName] = opts.feedbackBuffers[dstName];
-      feedbackBuffers[dstName] = opts.sourceBuffers[srcName];
-
-      // make sure the new destination buffer is a Buffer object
-      assert(feedbackBuffers[dstName] instanceof Buffer);
-    }
-    return {sourceBuffers, feedbackBuffers};
-  }
-
-  // Create a buffer and add to list of buffers to be deleted.
-  _createNewBuffer(name, opts): Buffer {
-    const buffer = new Buffer(this.gl, opts);
-    if (this.resources[name]) {
-      this.resources[name].delete();
-    }
-    this.resources[name] = buffer;
-    return buffer;
-  }
-
-  _getNextIndex(): number {
-    return (this.currentIndex + 1) % 2;
-  }
-}

package/src/transform/texture-transform.ts

@@ -1,344 +0,0 @@
-import GL from '@luma.gl/constants';
-
-import {cloneTextureFrom, readPixelsToArray, Buffer, Texture2D, Framebuffer} from '@luma.gl/webgl';
-
-import {
-  _transform as transformModule,
-  getShaderInfo,
-  getPassthroughFS,
-  typeToChannelCount,
-  combineInjects
-} from '@luma.gl/shadertools';
-
-import {updateForTextures, getSizeUniforms} from './transform-shader-utils';
-
-import type {TransformProps, TransformDrawOptions} from './transform-types';
-
-// TODO: move these constants to transform-shader-utils
-// Texture parameters needed so sample can precisely pick pixel for given element id.
-const SRC_TEX_PARAMETER_OVERRIDES = {
-  [GL.TEXTURE_MIN_FILTER]: GL.NEAREST,
-  [GL.TEXTURE_MAG_FILTER]: GL.NEAREST,
-  [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
-  [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE
-};
-const FS_OUTPUT_VARIABLE = 'transform_output';
-
-export default class TextureTransform {
-  gl: WebGL2RenderingContext;
-  id = 0;
-  currentIndex = 0;
-  _swapTexture = null;
-  targetTextureVarying = null;
-  targetTextureType = null;
-  samplerTextureMap = null;
-  bindings = []; // each element is an object : {sourceTextures, targetTexture, framebuffer}
-  resources = {}; // resources to be deleted
-
-  hasTargetTexture: boolean = false;
-  hasSourceTextures: boolean = false;
-  ownTexture: Texture2D | null = null;
-  elementIDBuffer: Buffer | null = null;
-  _targetRefTexName: string;
-  elementCount: number;
-
-  constructor(gl: WebGL2RenderingContext, props: TransformProps = {}) {
-    this.gl = gl;
-    this.id = this.currentIndex = 0;
-    this._swapTexture = null;
-    this.targetTextureVarying = null;
-    this.targetTextureType = null;
-    this.samplerTextureMap = null;
-    this.bindings = []; // each element is an object : {sourceTextures, targetTexture, framebuffer}
-
-    this.resources = {}; // resources to be deleted
-
-    this._initialize(props);
-    Object.seal(this);
-  }
-
-  updateModelProps(props: TransformProps = {}) {
-    const updatedModelProps = this._processVertexShader(props);
-    return Object.assign({}, props, updatedModelProps);
-  }
-
-  getDrawOptions(opts: TransformProps = {}): TransformDrawOptions {
-    const {sourceBuffers, sourceTextures, framebuffer, targetTexture} =
-      this.bindings[this.currentIndex];
-
-    const attributes = Object.assign({}, sourceBuffers, opts.attributes);
-    const uniforms = Object.assign({}, opts.uniforms);
-    const parameters = Object.assign({}, opts.parameters);
-    let discard = opts.discard;
-
-    if (this.hasSourceTextures || this.hasTargetTexture) {
-      attributes.transform_elementID = this.elementIDBuffer;
-
-      for (const sampler in this.samplerTextureMap) {
-        const textureName = this.samplerTextureMap[sampler];
-        uniforms[sampler] = sourceTextures[textureName];
-      }
-      this._setSourceTextureParameters();
-      // get texture size uniforms
-      const sizeUniforms = getSizeUniforms({
-        sourceTextureMap: sourceTextures,
-        targetTextureVarying: this.targetTextureVarying,
-        targetTexture
-      });
-      Object.assign(uniforms, sizeUniforms);
-    }
-    if (this.hasTargetTexture) {
-      discard = false;
-      parameters.viewport = [0, 0, framebuffer.width, framebuffer.height];
-    }
-
-    return {attributes, framebuffer, uniforms, discard, parameters};
-  }
-
-  swap() {
-    if (this._swapTexture) {
-      this.currentIndex = this._getNextIndex();
-      return true;
-    }
-    return false;
-  }
-
-  // update source and/or feedbackBuffers
-  update(opts = {}) {
-    this._setupTextures(opts);
-  }
-
-  // returns current target texture
-  getTargetTexture() {
-    const {targetTexture} = this.bindings[this.currentIndex];
-    return targetTexture;
-  }
-
-  getData({packed = false} = {}) {
-    const {framebuffer} = this.bindings[this.currentIndex];
-    const pixels = readPixelsToArray(framebuffer);
-
-    if (!packed) {
-      return pixels;
-    }
-
-    // readPixels returns 4 elements for each pixel, pack the elements when requested
-    const ArrayType = pixels.constructor;
-    const channelCount = typeToChannelCount(this.targetTextureType);
-    // @ts-expect-error
-    const packedPixels = new ArrayType((pixels.length * channelCount) / 4);
-    let packCount = 0;
-    for (let i = 0; i < pixels.length; i += 4) {
-      for (let j = 0; j < channelCount; j++) {
-        packedPixels[packCount++] = pixels[i + j];
-      }
-    }
-    return packedPixels;
-  }
-
-  // returns current framebuffer object that is being used.
-  getFramebuffer() {
-    const currentResources = this.bindings[this.currentIndex];
-    return currentResources.framebuffer;
-  }
-
-  // Delete owned resources.
-  delete() {
-    if (this.ownTexture) {
-      this.ownTexture.delete();
-    }
-    if (this.elementIDBuffer) {
-      this.elementIDBuffer.delete();
-    }
-  }
-
-  // Private
-
-  _initialize(props: TransformProps = {}) {
-    const {_targetTextureVarying, _swapTexture} = props;
-    this._swapTexture = _swapTexture;
-    this.targetTextureVarying = _targetTextureVarying;
-    this.hasTargetTexture = Boolean(_targetTextureVarying);
-    this._setupTextures(props);
-  }
-
-  // auto create target texture if requested
-  _createTargetTexture(props) {
-    const {sourceTextures, textureOrReference} = props;
-    if (textureOrReference instanceof Texture2D) {
-      return textureOrReference;
-    }
-    // 'targetTexture' is a reference souce texture.
-    const refTexture = sourceTextures[textureOrReference];
-    if (!refTexture) {
-      return null;
-    }
-
-    // save reference texture name, when corresponding source texture is updated
-    // we also update target texture.
-    this._targetRefTexName = textureOrReference;
-
-    return this._createNewTexture(refTexture);
-  }
-
-  _setupTextures(props: TransformProps = {}) {
-    const {sourceBuffers, _sourceTextures = {}, _targetTexture} = props;
-    const targetTexture = this._createTargetTexture({
-      sourceTextures: _sourceTextures,
-      textureOrReference: _targetTexture
-    });
-    this.hasSourceTextures =
-      this.hasSourceTextures || (_sourceTextures && Object.keys(_sourceTextures).length > 0);
-    this._updateBindings({sourceBuffers, sourceTextures: _sourceTextures, targetTexture});
-    if ('elementCount' in props) {
-      this._updateElementIDBuffer(props.elementCount);
-    }
-  }
-
-  _updateElementIDBuffer(elementCount: number): void {
-    if (typeof elementCount !== 'number' || this.elementCount >= elementCount) {
-      return;
-    }
-    // NOTE: using float so this will work with GLSL 1.0 shaders.
-    const elementIds = new Float32Array(elementCount);
-    elementIds.forEach((_, index, array) => {
-      array[index] = index;
-    });
-    if (!this.elementIDBuffer) {
-      this.elementIDBuffer = new Buffer(this.gl, {
-        data: elementIds,
-        accessor: {size: 1}
-      });
-    } else {
-      this.elementIDBuffer.setData({data: elementIds});
-    }
-    this.elementCount = elementCount;
-  }
-
-  _updateBindings(opts) {
-    this.bindings[this.currentIndex] = this._updateBinding(this.bindings[this.currentIndex], opts);
-    if (this._swapTexture) {
-      const {sourceTextures, targetTexture} = this._swapTextures(this.bindings[this.currentIndex]);
-      const nextIndex = this._getNextIndex();
-      this.bindings[nextIndex] = this._updateBinding(this.bindings[nextIndex], {
-        sourceTextures,
-        targetTexture
-      });
-    }
-  }
-
-  _updateBinding(binding, opts) {
-    const {sourceBuffers, sourceTextures, targetTexture} = opts;
-    if (!binding) {
-      binding = {
-        sourceBuffers: {},
-        sourceTextures: {},
-        targetTexture: null
-      };
-    }
-    Object.assign(binding.sourceTextures, sourceTextures);
-    Object.assign(binding.sourceBuffers, sourceBuffers);
-    if (targetTexture) {
-      binding.targetTexture = targetTexture;
-
-      const {width, height} = targetTexture;
-      const {framebuffer} = binding;
-      if (framebuffer) {
-        // First update texture without re-sizing attachments
-        framebuffer.update({
-          attachments: {[GL.COLOR_ATTACHMENT0]: targetTexture},
-          resizeAttachments: false
-        });
-        // Resize to new taget texture size
-        framebuffer.resize({width, height});
-      } else {
-        binding.framebuffer = new Framebuffer(this.gl, {
-          id: `transform-framebuffer`,
-          width,
-          height,
-          attachments: {
-            [GL.COLOR_ATTACHMENT0]: targetTexture
-          }
-        });
-      }
-    }
-    return binding;
-  }
-
-  // set texture filtering parameters on source textures.
-  _setSourceTextureParameters() {
-    const index = this.currentIndex;
-    const {sourceTextures} = this.bindings[index];
-    for (const name in sourceTextures) {
-      sourceTextures[name].setParameters(SRC_TEX_PARAMETER_OVERRIDES);
-    }
-  }
-
-  _swapTextures(opts) {
-    if (!this._swapTexture) {
-      return null;
-    }
-    const sourceTextures = Object.assign({}, opts.sourceTextures);
-    sourceTextures[this._swapTexture] = opts.targetTexture;
-
-    const targetTexture = opts.sourceTextures[this._swapTexture];
-
-    return {sourceTextures, targetTexture};
-  }
-
-  // Create a buffer and add to list of buffers to be deleted.
-  _createNewTexture(refTexture) {
-    const texture = cloneTextureFrom(refTexture, {
-      parameters: {
-        [GL.TEXTURE_MIN_FILTER]: GL.NEAREST,
-        [GL.TEXTURE_MAG_FILTER]: GL.NEAREST,
-        [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
-        [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE
-      },
-      pixelStore: {
-        [GL.UNPACK_FLIP_Y_WEBGL]: false
-      }
-    });
-
-    // thre can only be one target texture
-    if (this.ownTexture) {
-      this.ownTexture.delete();
-    }
-    this.ownTexture = texture;
-
-    return texture;
-  }
-
-  _getNextIndex() {
-    return (this.currentIndex + 1) % 2;
-  }
-
-  // build and return shader releated parameters
-  _processVertexShader(props: TransformProps = {}) {
-    const {sourceTextures, targetTexture} = this.bindings[this.currentIndex];
-    // @ts-expect-error TODO - uniforms is not present
-    const {vs, uniforms, targetTextureType, inject, samplerTextureMap} = updateForTextures({
-      vs: props.vs,
-      sourceTextureMap: sourceTextures,
-      targetTextureVarying: this.targetTextureVarying,
-      targetTexture
-    });
-    const combinedInject = combineInjects([props.inject || {}, inject]);
-    this.targetTextureType = targetTextureType;
-    this.samplerTextureMap = samplerTextureMap;
-    const fs =
-      props._fs ||
-      getPassthroughFS({
-        version: getShaderInfo(vs).version,
-        input: this.targetTextureVarying,
-        inputType: targetTextureType,
-        output: FS_OUTPUT_VARIABLE
-      });
-    const modules =
-      this.hasSourceTextures || this.targetTextureVarying
-        // @ts-expect-error
-        ? [transformModule].concat(props.modules || [])
-        : props.modules;
-    return {vs, fs, modules, uniforms, inject: combinedInject};
-  }
-}