@luma.gl/engine 9.1.0-beta.1 → 9.1.0-beta.12

package/src/model/model.ts

@@ -303,8 +303,7 @@ export class Model {
     this.pipeline = this._updatePipeline();
 
     this.vertexArray = device.createVertexArray({
-      shaderLayout: this.pipeline.shaderLayout,
-      bufferLayout: this.pipeline.bufferLayout
+      renderPipeline: this.pipeline
     });
 
     // Now we can apply geometry attributes
@@ -351,19 +350,16 @@ export class Model {
   }
 
   destroy(): void {
-    if (!this._destroyed) {
-      // Release pipeline before we destroy the shaders used by the pipeline
-      this.pipelineFactory.release(this.pipeline);
-      // Release the shaders
-      this.shaderFactory.release(this.pipeline.vs);
-      if (this.pipeline.fs) {
-        this.shaderFactory.release(this.pipeline.fs);
-      }
-      this._uniformStore.destroy();
-      // TODO - mark resource as managed and destroyIfManaged() ?
-      this._gpuGeometry?.destroy();
-      this._destroyed = true;
-    }
+    if (this._destroyed) return;
+    this.pipelineFactory.release(this.pipeline);
+    this.shaderFactory.release(this.pipeline.vs);
+    if (this.pipeline.fs) {
+      this.shaderFactory.release(this.pipeline.fs);
+    }
+    this._uniformStore.destroy();
+    // TODO - mark resource as managed and destroyIfManaged() ?
+    this._gpuGeometry?.destroy();
+    this._destroyed = true;
   }
 
   // Draw call
@@ -514,8 +510,7 @@ export class Model {
     // vertex array needs to be updated if we update buffer layout,
     // but not if we update parameters
     this.vertexArray = this.device.createVertexArray({
-      shaderLayout: this.pipeline.shaderLayout,
-      bufferLayout: this.pipeline.bufferLayout
+      renderPipeline: this.pipeline
     });
 
     // Reapply geometry attributes to the new vertex array
@@ -678,6 +673,15 @@ export class Model {
 
   // DEPRECATED METHODS
 
+  /**
+   * Sets individual uniforms
+   * @deprecated WebGL only, use uniform buffers for portability
+   * @param uniforms
+   */
+  setUniforms(uniforms: Record<string, UniformValue>): void {
+    this.setUniformsWebGL(uniforms);
+  }
+
   /**
    * Sets individual uniforms
    * @deprecated WebGL only, use uniform buffers for portability

package/src/models/clip-space.ts

@@ -35,19 +35,19 @@ fn vertexMain(inputs: VertexInputs) -> FragmentInputs {
 
 const CLIPSPACE_VERTEX_SHADER = /* glsl */ `\
 #version 300 es
-in vec2 clipSpacePosition;
-in vec2 texCoord;
-in vec2 coordinate;
+in vec2 clipSpacePositions;
+in vec2 texCoords;
+in vec2 coordinates;
 
 out vec2 position;
 out vec2 coordinate;
 out vec2 uv;
 
 void main(void) {
-  gl_Position = vec4(clipSpacePosition, 0., 1.);
-  position = clipSpacePosition;
-  coordinate = coordinate;
-  uv = texCoord;
+  gl_Position = vec4(clipSpacePositions, 0., 1.);
+  position = clipSpacePositions;
+  coordinate = coordinates;
+  uv = texCoords;
 }
 `;
 
@@ -78,9 +78,9 @@ export class ClipSpace extends Model {
         topology: 'triangle-strip',
         vertexCount: 4,
         attributes: {
-          clipSpacePosition: {size: 2, value: new Float32Array(POSITIONS)},
-          texCoord: {size: 2, value: new Float32Array(TEX_COORDS)},
-          coordinate: {size: 2, value: new Float32Array(TEX_COORDS)}
+          clipSpacePositions: {size: 2, value: new Float32Array(POSITIONS)},
+          texCoords: {size: 2, value: new Float32Array(TEX_COORDS)},
+          coordinates: {size: 2, value: new Float32Array(TEX_COORDS)}
         }
       })
     });