p5 2.2.1 → 2.2.2-rc.0

package/dist/webgl/index.js

@@ -1,4 +1,4 @@
-import { r as renderer3D, p as primitives3D, l as light, m as material, c as camera, f as framebuffer, t as texture } from '../rendering-h9unX5K0.js';
+import { r as renderer3D, p as primitives3D, l as light, m as material, c as camera, f as framebuffer, t as texture } from '../rendering-B8po3Onj.js';
 import interaction from './interaction.js';
 import loading from './loading.js';
 import text from './text.js';
@@ -8,14 +8,14 @@ import matrix from '../math/p5.Matrix.js';
 import geometry from './p5.Geometry.js';
 import dataArray from './p5.DataArray.js';
 import rendererGL from './p5.RendererGL.js';
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../creating_reading-ZXzcZEsb.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';
@@ -55,7 +55,7 @@ import './strands_glslBackend.js';
 import '../strands/ir_types.js';
 import '../strands/ir_dag.js';
 import '../strands/strands_FES.js';
-import '../ir_builders-DXNgaB9N.js';
+import '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 import './shaderHookUtils.js';

package/dist/webgl/interaction.js

@@ -1,4 +1,4 @@
-import { G as GRID, i as AXES } from '../constants-DQyACdzq.js';
+import { G as GRID, i as AXES } from '../constants-D3npMLOW.js';
 import { Vector } from '../math/p5.Vector.js';
 
 /**

package/dist/webgl/light.js

@@ -1,13 +1,13 @@
-export { l as default } from '../rendering-h9unX5K0.js';
+export { l as default } from '../rendering-B8po3Onj.js';
 import '../math/p5.Vector.js';
 import '../creating_reading-ZXzcZEsb.js';
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';

package/dist/webgl/loading.js

@@ -1,7 +1,7 @@
 import { Geometry } from './p5.Geometry.js';
 import { Vector } from '../math/p5.Vector.js';
-import { a as request } from '../rendering-h9unX5K0.js';
-import '../constants-DQyACdzq.js';
+import { a as request } from '../rendering-B8po3Onj.js';
+import '../constants-D3npMLOW.js';
 import './p5.DataArray.js';
 import '../io/utilities.js';
 import '../creating_reading-ZXzcZEsb.js';
@@ -10,7 +10,7 @@ import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';
@@ -634,12 +634,10 @@ function loading(p5, fn){
               const vertString = tokens[vertexTokens[tokenInd]];
               let vertParts = vertString.split('/');
 
-              // TODO: Faces can technically use negative numbers to refer to the
-              // previous nth vertex. I haven't seen this used in practice, but
-              // it might be good to implement this in the future.
-
               for (let i = 0; i < vertParts.length; i++) {
-                vertParts[i] = parseInt(vertParts[i]) - 1;
+                let index = parseInt(vertParts[i]);
+                if (index > 0) index -= 1; // OBJ uses 1-based indexing
+                vertParts[i] = index;
               }
 
               if (!usedVerts[vertString]) {
@@ -648,11 +646,11 @@ function loading(p5, fn){
 
               if (usedVerts[vertString][currentMaterial] === undefined) {
                 const vertIndex = model.vertices.length;
-                model.vertices.push(loadedVerts.v[vertParts[0]].copy());
-                model.uvs.push(loadedVerts.vt[vertParts[1]] ?
-                  loadedVerts.vt[vertParts[1]].slice() : [0, 0]);
-                model.vertexNormals.push(loadedVerts.vn[vertParts[2]] ?
-                  loadedVerts.vn[vertParts[2]].copy() : new Vector());
+                model.vertices.push(loadedVerts.v.at(vertParts[0]).copy());
+                model.uvs.push(loadedVerts.vt.at(vertParts[1]) ?
+                  loadedVerts.vt.at(vertParts[1]).slice() : [0, 0]);
+                model.vertexNormals.push(loadedVerts.vn.at(vertParts[2]) ?
+                  loadedVerts.vn.at(vertParts[2]).copy() : new Vector());
 
                 usedVerts[vertString][currentMaterial] = vertIndex;
                 face.push(vertIndex);

package/dist/webgl/material.js

@@ -1,5 +1,5 @@
-import '../constants-DQyACdzq.js';
-export { m as default } from '../rendering-h9unX5K0.js';
+import '../constants-D3npMLOW.js';
+export { m as default } from '../rendering-B8po3Onj.js';
 import './p5.Shader.js';
 import '../creating_reading-ZXzcZEsb.js';
 import '../dom/p5.Element.js';
@@ -7,7 +7,7 @@ import '../dom/p5.File.js';
 import '../io/p5.XML.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';

package/dist/webgl/p5.Camera.js

@@ -1,9 +1,9 @@
 import '../math/p5.Matrix.js';
 import '../math/p5.Vector.js';
 import './p5.Quat.js';
-export { C as Camera, c as default } from '../rendering-h9unX5K0.js';
+export { C as Camera, c as default } from '../rendering-B8po3Onj.js';
 import '../math/Matrices/Matrix.js';
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../math/Matrices/MatrixInterface.js';
 import '../creating_reading-ZXzcZEsb.js';
 import 'colorjs.io/fn';
@@ -11,7 +11,7 @@ import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';

package/dist/webgl/p5.Framebuffer.js

@@ -1,12 +1,12 @@
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../creating_reading-ZXzcZEsb.js';
-export { w as Framebuffer, v as FramebufferCamera, F as FramebufferTexture, f as default } from '../rendering-h9unX5K0.js';
+export { w as Framebuffer, v as FramebufferCamera, F as FramebufferTexture, f as default } from '../rendering-B8po3Onj.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';

package/dist/webgl/p5.Geometry.js

@@ -1,4 +1,4 @@
-import { a7 as FLAT, a8 as SMOOTH } from '../constants-DQyACdzq.js';
+import { a7 as FLAT, a8 as SMOOTH } from '../constants-D3npMLOW.js';
 import { DataArray } from './p5.DataArray.js';
 import { Vector } from '../math/p5.Vector.js';
 import { downloadFile } from '../io/utilities.js';

package/dist/webgl/p5.Quat.js

@@ -1,5 +1,5 @@
 import { Vector } from '../math/p5.Vector.js';
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 
 /**
  * @module Math

package/dist/webgl/p5.RendererGL.js

@@ -1,9 +1,9 @@
-import { ac as WEBGL, aa as WEBGL2, L as LIGHTEST, D as DARKEST, S as SUBTRACT, R as REPLACE, E as EXCLUSION, a as SCREEN, M as MULTIPLY, b as REMOVE, A as ADD, B as BLEND, c as TRIANGLES, p as CORNER, U as UNSIGNED_BYTE, g as LINEAR, aG as LINEAR_MIPMAP, h as TEXTURE, F as FLOAT, d as UNSIGNED_INT, H as HALF_FLOAT } from '../constants-DQyACdzq.js';
-import { R as Renderer3D, o as readPixelWebGL, q as readPixelsWebGL, M as MipmapTexture, h as getWebGLShaderAttributes, g as getWebGLUniformMetadata, s as setWebGLUniformValue, e as setWebGLTextureParams, j as populateGLSLHooks, u as checkWebGLCapabilities } from '../rendering-h9unX5K0.js';
+import { ac as WEBGL, aa as WEBGL2, L as LIGHTEST, D as DARKEST, S as SUBTRACT, R as REPLACE, E as EXCLUSION, a as SCREEN, M as MULTIPLY, b as REMOVE, A as ADD, B as BLEND, c as TRIANGLES, p as CORNER, U as UNSIGNED_BYTE, g as LINEAR, aG as LINEAR_MIPMAP, h as TEXTURE, F as FLOAT, d as UNSIGNED_INT, H as HALF_FLOAT } from '../constants-D3npMLOW.js';
+import { R as Renderer3D, o as readPixelWebGL, q as readPixelsWebGL, M as MipmapTexture, h as getWebGLShaderAttributes, g as getWebGLUniformMetadata, s as setWebGLUniformValue, e as setWebGLTextureParams, j as populateGLSLHooks, u as checkWebGLCapabilities } from '../rendering-B8po3Onj.js';
 import { getStrokeDefs } from './enums.js';
 import { Shader } from './p5.Shader.js';
 import { R as RGB, h as RGBA } from '../creating_reading-ZXzcZEsb.js';
-import { I as Image } from '../p5.Renderer-D-5LdCRz.js';
+import { I as Image } from '../p5.Renderer-xpFkUQC6.js';
 import { glslBackend } from './strands_glslBackend.js';
 import '../strands/ir_types.js';
 import { getShaderHookTypes } from './shaderHookUtils.js';
@@ -47,7 +47,7 @@ import '../core/filterShaders.js';
 import '../math/trigonometry.js';
 import '../strands/ir_dag.js';
 import '../strands/strands_FES.js';
-import '../ir_builders-DXNgaB9N.js';
+import '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 

package/dist/webgl/p5.Texture.js

@@ -1,8 +1,8 @@
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../dom/p5.Element.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../dom/p5.MediaElement.js';
-export { M as MipmapTexture, T as Texture, t as default } from '../rendering-h9unX5K0.js';
+export { M as MipmapTexture, T as Texture, t as default } from '../rendering-B8po3Onj.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
 import '../creating_reading-ZXzcZEsb.js';

package/dist/webgl/strands_glslBackend.js

@@ -1,7 +1,7 @@
 import { NodeTypeToName, NodeType, OpCode, BaseType, OpCodeToSymbol, isStructType, StatementType, DataType, BlockType } from '../strands/ir_types.js';
 import { getNodeDataFromID, extractNodeTypeInfo } from '../strands/ir_dag.js';
 import { internalError } from '../strands/strands_FES.js';
-import { f as functionCallNode } from '../ir_builders-DXNgaB9N.js';
+import { f as functionCallNode } from '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 

package/dist/webgl/text.js

@@ -1,5 +1,5 @@
-import { h as TEXTURE, c as TRIANGLES } from '../constants-DQyACdzq.js';
-import { R as Renderer3D } from '../rendering-h9unX5K0.js';
+import { h as TEXTURE, c as TRIANGLES } from '../constants-D3npMLOW.js';
+import { R as Renderer3D } from '../rendering-B8po3Onj.js';
 import { Vector } from '../math/p5.Vector.js';
 import { Geometry } from './p5.Geometry.js';
 import { Font, arrayCommandsToObjects } from '../type/p5.Font.js';
@@ -9,7 +9,7 @@ import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';
@@ -729,7 +729,7 @@ function text(p5, fn) {
 
     if (!p5.Font.hasGlyphData(this.states.textFont)) {
       console.log(
-        'WEBGL: only Opentype (.otf) and Truetype (.ttf) fonts with glyph data are supported'
+        'WEBGL: only Opentype (.otf) and Truetype (.ttf) fonts with glyph data are supported. Make sure to set the font using textFont() before drawing text.'
       );
       return;
     }

package/dist/webgl/utils.js

@@ -1,12 +1,12 @@
-import '../constants-DQyACdzq.js';
-export { u as checkWebGLCapabilities, h as getWebGLShaderAttributes, g as getWebGLUniformMetadata, j as populateGLSLHooks, o as readPixelWebGL, q as readPixelsWebGL, e as setWebGLTextureParams, s as setWebGLUniformValue } from '../rendering-h9unX5K0.js';
+import '../constants-D3npMLOW.js';
+export { u as checkWebGLCapabilities, h as getWebGLShaderAttributes, g as getWebGLUniformMetadata, j as populateGLSLHooks, o as readPixelWebGL, q as readPixelsWebGL, e as setWebGLTextureParams, s as setWebGLUniformValue } from '../rendering-B8po3Onj.js';
 import '../creating_reading-ZXzcZEsb.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-D-5LdCRz.js';
+import '../p5.Renderer-xpFkUQC6.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';

package/dist/webgpu/index.js

@@ -1,5 +1,5 @@
 import rendererWebGPU from './p5.RendererWebGPU.js';
-import '../constants-DQyACdzq.js';
+import '../constants-D3npMLOW.js';
 import '../webgl/enums.js';
 import '../strands/ir_types.js';
 import './shaders/color.js';
@@ -10,7 +10,7 @@ import './shaders/blit.js';
 import './strands_wgslBackend.js';
 import '../strands/ir_dag.js';
 import '../strands/strands_FES.js';
-import '../ir_builders-DXNgaB9N.js';
+import '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 import './shaders/functions/noise3DWGSL.js';

package/dist/webgpu/p5.RendererWebGPU.js

@@ -1,4 +1,4 @@
-import { W as WEBGPU, T as TRIANGLE_STRIP, L as LIGHTEST, D as DARKEST, S as SUBTRACT, R as REPLACE, E as EXCLUSION, a as SCREEN, M as MULTIPLY, b as REMOVE, A as ADD, B as BLEND, c as TRIANGLES, U as UNSIGNED_BYTE, F as FLOAT, H as HALF_FLOAT, d as UNSIGNED_INT, e as MIRROR, f as REPEAT, C as CLAMP, g as LINEAR, N as NEAREST } from '../constants-DQyACdzq.js';
+import { W as WEBGPU, T as TRIANGLE_STRIP, L as LIGHTEST, D as DARKEST, S as SUBTRACT, R as REPLACE, E as EXCLUSION, a as SCREEN, M as MULTIPLY, b as REMOVE, A as ADD, B as BLEND, c as TRIANGLES, U as UNSIGNED_BYTE, F as FLOAT, H as HALF_FLOAT, d as UNSIGNED_INT, e as MIRROR, f as REPEAT, C as CLAMP, g as LINEAR, N as NEAREST } from '../constants-D3npMLOW.js';
 import { getStrokeDefs } from '../webgl/enums.js';
 import { DataType } from '../strands/ir_types.js';
 import { colorVertexShader, colorFragmentShader } from './shaders/color.js';
@@ -12,7 +12,7 @@ import { baseFilterVertexShader, baseFilterFragmentShader } from './shaders/filt
 import { imageLightVertexShader, imageLightDiffusedFragmentShader, imageLightSpecularFragmentShader } from './shaders/imageLight.js';
 import '../strands/ir_dag.js';
 import '../strands/strands_FES.js';
-import '../ir_builders-DXNgaB9N.js';
+import '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 
@@ -97,6 +97,10 @@ function rendererWebGPU(p5, fn) {
       this.finalCamera = new Camera(this);
       this.finalCamera._computeCameraDefaultSettings();
       this.finalCamera._setDefaultCamera();
+
+      this.depthFormat = 'depth24plus-stencil8';
+      this.depthTexture = null;
+      this.depthTextureView = null;
     }
 
     async setupContext() {
@@ -137,7 +141,6 @@ function rendererWebGPU(p5, fn) {
       });
 
       // TODO disablable stencil
-      this.depthFormat = 'depth24plus-stencil8';
       this.mainFramebuffer = this.createFramebuffer({ _useCanvasFormat: true });
       this._updateSize();
       this._update();
@@ -194,6 +197,7 @@ function rendererWebGPU(p5, fn) {
     }
 
     _updateSize() {
+      if (!this.device || !this.depthFormat) return;
       if (this.depthTexture && this.depthTexture.destroy) {
         this.flushDraw();
         const textureToDestroy = this.depthTexture;
@@ -288,6 +292,7 @@ function rendererWebGPU(p5, fn) {
     }
 
     clear(...args) {
+      if (!this.device || !this.drawingContext) return;
       const _r = args[0] || 0;
       const _g = args[1] || 0;
       const _b = args[2] || 0;
@@ -354,6 +359,7 @@ function rendererWebGPU(p5, fn) {
      * occlude anything subsequently drawn.
      */
     clearDepth(depth = 1) {
+      if (!this.device || !this.depthTextureView) return;
       this._finishActiveRenderPass();
       const commandEncoder = this.device.createCommandEncoder();
 
@@ -1902,7 +1908,7 @@ function rendererWebGPU(p5, fn) {
 
     getNextBindingIndex({ vert, frag }, group = 0) {
       // Get the highest binding index in the specified group and return the next available
-      const samplerRegex = /@group\((\d+)\)\s*@binding\((\d+)\)\s*var\s+(\w+)\s*:\s*(texture_2d<f32>|sampler|uniform)/g;
+      const samplerRegex = /@group\((\d+)\)\s*@binding\((\d+)\)\s*var(?:<uniform>)?\s+(\w+)\s*:\s*(texture_2d<f32>|sampler|uniform|\w+)/g;
       let maxBindingIndex = -1;
 
       for (const [src, visibility] of [
@@ -2252,6 +2258,9 @@ function rendererWebGPU(p5, fn) {
       // Inject hook uniforms as a separate struct at a new binding
       let hookUniformFields = '';
       for (const key in shader.hooks.uniforms) {
+        // Skip textures, they don't get added to structs
+        if (key.endsWith(': sampler2D')) continue;
+
         // WGSL format: "name: type"
         hookUniformFields += `  ${key},\n`;
       }

package/dist/webgpu/strands_wgslBackend.js

@@ -1,7 +1,7 @@
 import { BaseType, DataType, NodeTypeToName, NodeType, OpCode, OpCodeToSymbol, isStructType, StatementType, BlockType } from '../strands/ir_types.js';
 import { getNodeDataFromID, extractNodeTypeInfo } from '../strands/ir_dag.js';
 import { internalError } from '../strands/strands_FES.js';
-import { v as variableNode, c as createStrandsNode, f as functionCallNode } from '../ir_builders-DXNgaB9N.js';
+import { v as variableNode, c as createStrandsNode, f as functionCallNode } from '../ir_builders-w12-GSxu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
 
@@ -225,10 +225,11 @@ const wgslBackend = {
     return primitiveTypeName;
   },
   generateHookUniformKey(name, typeInfo) {
-    // For sampler2D types, we don't add them to the uniform struct
-    // Instead, they become separate texture and sampler bindings
+    // For sampler2D types, we don't add them to the uniform struct,
+    // but we still need them in the shader's hooks object so that
+    // they can be set by users.
     if (typeInfo.baseType === 'sampler2D') {
-      return null; // Signal that this should not be added to uniform struct
+      return `${name}: sampler2D`; // Signal that this should not be added to uniform struct
     }
     return `${name}: ${this.getTypeName(typeInfo.baseType, typeInfo.dimension)}`;
   },