p5 2.2.3 → 2.3.0-rc.1

package/dist/webgl/strands_glslBackend.js

@@ -1,388 +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-Cd6rU9Vm.js';
+export { g as glslBackend } from '../strands_glslBackend-i-ReKgZo.js';
+import '../strands/ir_types.js';
+import '../strands/ir_dag.js';
+import '../strands/strands_FES.js';
+import '../ir_builders-C2ebb6Lu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
-
-function shouldCreateTemp(dag, nodeID) {
-  const nodeType = dag.nodeTypes[nodeID];
-  if (nodeType !== NodeType.OPERATION) return false;
-  if (dag.baseTypes[nodeID] === BaseType.SAMPLER2D) return false;
-  const uses = dag.usedBy[nodeID] || [];
-  return uses.length > 1;
-}
-const TypeNames = {
-  'float1': 'float',
-  'float2': 'vec2',
-  'float3': 'vec3',
-  'float4': 'vec4',
-  'int1': 'int',
-  'int2': 'ivec2',
-  'int3': 'ivec3',
-  'int4': 'ivec4',
-  'bool1': 'bool',
-  'bool2': 'bvec2',
-  'bool3': 'bvec3',
-  'bool4': 'bvec4',
-  'mat2': 'mat2x2',
-  'mat3': 'mat3x3',
-  'mat4': 'mat4x4',
-};
-const cfgHandlers = {
-  [BlockType.DEFAULT]: (blockID, strandsContext, generationContext) => {
-    const { dag, cfg } = strandsContext;
-    const instructions = cfg.blockInstructions[blockID] || [];
-    for (const nodeID of instructions) {
-      const nodeType = dag.nodeTypes[nodeID];
-      if (shouldCreateTemp(dag, nodeID)) {
-        const declaration = glslBackend.generateDeclaration(generationContext, dag, nodeID);
-        generationContext.write(declaration);
-      }
-      if (nodeType === NodeType.STATEMENT) {
-        glslBackend.generateStatement(generationContext, dag, nodeID);
-      }
-      if (nodeType === NodeType.ASSIGNMENT) {
-        glslBackend.generateAssignment(generationContext, dag, nodeID);
-        generationContext.visitedNodes.add(nodeID);
-      }
-    }
-  },
-  [BlockType.BRANCH](blockID, strandsContext, generationContext) {
-    const { dag, cfg } = strandsContext;
-    // Find all phi nodes in this branch block and declare them
-    const blockInstructions = cfg.blockInstructions[blockID] || [];
-    for (const nodeID of blockInstructions) {
-      const node = getNodeDataFromID(dag, nodeID);
-      if (node.nodeType === NodeType.PHI) {
-        // Check if the phi node's first dependency already has a temp name
-        const dependsOn = node.dependsOn || [];
-        if (dependsOn.length > 0) {
-          const firstDependency = dependsOn[0];
-          const existingTempName = generationContext.tempNames[firstDependency];
-          if (existingTempName) {
-            // Reuse the existing temp name instead of creating a new one
-            generationContext.tempNames[nodeID] = existingTempName;
-            continue; // Skip declaration, just alias to existing variable
-          }
-        }
-
-        // Otherwise, create a new temp variable for the phi node
-        const tmp = `T${generationContext.nextTempID++}`;
-        generationContext.tempNames[nodeID] = tmp;
-        const T = extractNodeTypeInfo(dag, nodeID);
-        const typeName = glslBackend.getTypeName(T.baseType, T.dimension);
-        generationContext.write(`${typeName} ${tmp};`);
-      }
-    }
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-  },
-  [BlockType.IF_COND](blockID, strandsContext, generationContext) {
-    const { dag, cfg } = strandsContext;
-    const conditionID = cfg.blockConditions[blockID];
-    const condExpr = glslBackend.generateExpression(generationContext, dag, conditionID);
-    generationContext.write(`if (${condExpr})`);
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-  },
-  [BlockType.ELSE_COND](blockID, strandsContext, generationContext) {
-    generationContext.write(`else`);
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-  },
-  [BlockType.IF_BODY](blockID, strandsContext, generationContext) {
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-    this.assignPhiNodeValues(blockID, strandsContext, generationContext);
-  },
-  [BlockType.SCOPE_START](blockID, strandsContext, generationContext) {
-    generationContext.write(`{`);
-    generationContext.indent++;
-  },
-  [BlockType.SCOPE_END](blockID, strandsContext, generationContext) {
-    generationContext.indent--;
-    generationContext.write(`}`);
-  },
-  [BlockType.MERGE](blockID, strandsContext, generationContext) {
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-  },
-  [BlockType.FUNCTION](blockID, strandsContext, generationContext) {
-    this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
-  },
-  [BlockType.FOR](blockID, strandsContext, generationContext) {
-    const { dag, cfg } = strandsContext;
-    const instructions = cfg.blockInstructions[blockID] || [];
-
-    generationContext.write(`for (`);
-
-    // Set flag to suppress semicolon on the last statement
-    const originalSuppressSemicolon = generationContext.suppressSemicolon;
-
-    for (let i = 0; i < instructions.length; i++) {
-      const nodeID = instructions[i];
-      const node = getNodeDataFromID(dag, nodeID);
-      const isLast = i === instructions.length - 1;
-
-      // Suppress semicolon on the last statement
-      generationContext.suppressSemicolon = isLast;
-
-      if (shouldCreateTemp(dag, nodeID)) {
-        const declaration = glslBackend.generateDeclaration(generationContext, dag, nodeID);
-        generationContext.write(declaration);
-      }
-      if (node.nodeType === NodeType.STATEMENT) {
-        glslBackend.generateStatement(generationContext, dag, nodeID);
-      }
-      if (node.nodeType === NodeType.ASSIGNMENT) {
-        glslBackend.generateAssignment(generationContext, dag, nodeID);
-        generationContext.visitedNodes.add(nodeID);
-      }
-    }
-
-    // Restore original flag
-    generationContext.suppressSemicolon = originalSuppressSemicolon;
-
-    generationContext.write(`)`);
-  },
-  assignPhiNodeValues(blockID, strandsContext, generationContext) {
-    const { dag, cfg } = strandsContext;
-    // Find all phi nodes that this block feeds into
-    const successors = cfg.outgoingEdges[blockID] || [];
-    for (const successorBlockID of successors) {
-      const instructions = cfg.blockInstructions[successorBlockID] || [];
-      for (const nodeID of instructions) {
-        const node = getNodeDataFromID(dag, nodeID);
-        if (node.nodeType === NodeType.PHI) {
-          // Find which input of this phi node corresponds to our block
-          const branchIndex = node.phiBlocks?.indexOf(blockID);
-          if (branchIndex !== -1 && branchIndex < node.dependsOn.length) {
-            const sourceNodeID = node.dependsOn[branchIndex];
-            const tempName = generationContext.tempNames[nodeID];
-            if (tempName && sourceNodeID !== null) {
-              const sourceExpr = glslBackend.generateExpression(generationContext, dag, sourceNodeID);
-              generationContext.write(`${tempName} = ${sourceExpr};`);
-            }
-          }
-        }
-      }
-    }
-  },
-};
-const glslBackend = {
-  hookEntry(hookType) {
-    const firstLine = `(${hookType.parameters.flatMap((param) => {
-      return `${param.qualifiers?.length ? param.qualifiers.join(' ') : ''}${param.type.typeName} ${param.name}`;
-    }).join(', ')}) {`;
-    return firstLine;
-  },
-  getTypeName(baseType, dimension) {
-    const primitiveTypeName = TypeNames[baseType + dimension];
-    if (!primitiveTypeName) {
-      return baseType;
-    }
-    return primitiveTypeName;
-  },
-  generateHookUniformKey(name, typeInfo) {
-    return `${this.getTypeName(typeInfo.baseType, typeInfo.dimension)} ${name}`;
-  },
-  generateVaryingVariable(varName, typeInfo) {
-    return `${typeInfo.fnName} ${varName}`;
-  },
-  generateLocalDeclaration(varName, typeInfo) {
-    const typeName = typeInfo.fnName;
-    return `${typeName} ${varName};`;
-  },
-  generateStatement(generationContext, dag, nodeID) {
-    const node = getNodeDataFromID(dag, nodeID);
-    // Generate the expression followed by semicolon (unless suppressed)
-    const semicolon = generationContext.suppressSemicolon ? '' : ';';
-    if (node.statementType === StatementType.DISCARD) {
-      generationContext.write(`discard${semicolon}`);
-    } else if (node.statementType === StatementType.BREAK) {
-      generationContext.write(`break${semicolon}`);
-    } else if (node.statementType === StatementType.EXPRESSION) {
-      const exprNodeID = node.dependsOn[0];
-      const expr = this.generateExpression(generationContext, dag, exprNodeID);
-      generationContext.write(`${expr}${semicolon}`);
-    } else if (node.statementType === StatementType.EMPTY) {
-      generationContext.write(semicolon);
-    } else if (node.statementType === StatementType.EARLY_RETURN) {
-      const exprNodeID = node.dependsOn[0];
-      const expr = this.generateExpression(generationContext, dag, exprNodeID);
-      generationContext.write(`return ${expr}${semicolon}`);
-    }
-  },
-  generateAssignment(generationContext, dag, nodeID) {
-    const node = getNodeDataFromID(dag, nodeID);
-    // dependsOn[0] = targetNodeID, dependsOn[1] = sourceNodeID
-    const targetNodeID = node.dependsOn[0];
-    const sourceNodeID = node.dependsOn[1];
-
-    // Generate the target expression (could be variable or swizzle)
-    const targetExpr = this.generateExpression(generationContext, dag, targetNodeID);
-    const sourceExpr = this.generateExpression(generationContext, dag, sourceNodeID);
-    const semicolon = generationContext.suppressSemicolon ? '' : ';';
-
-    // Generate assignment if we have both target and source
-    if (targetExpr && sourceExpr && targetExpr !== sourceExpr) {
-      generationContext.write(`${targetExpr} = ${sourceExpr}${semicolon}`);
-    }
-  },
-  generateDeclaration(generationContext, dag, nodeID) {
-    const expr = this.generateExpression(generationContext, dag, nodeID);
-    const tmp = `T${generationContext.nextTempID++}`;
-    generationContext.tempNames[nodeID] = tmp;
-    const T = extractNodeTypeInfo(dag, nodeID);
-    const typeName = this.getTypeName(T.baseType, T.dimension);
-    return `${typeName} ${tmp} = ${expr};`;
-  },
-  generateReturnStatement(strandsContext, generationContext, rootNodeID, returnType) {
-    const dag = strandsContext.dag;
-    const rootNode = getNodeDataFromID(dag, rootNodeID);
-    if (isStructType(returnType)) {
-      const structTypeInfo = returnType;
-      for (let i = 0; i < structTypeInfo.properties.length; i++) {
-        const prop = structTypeInfo.properties[i];
-        const val = this.generateExpression(generationContext, dag, rootNode.dependsOn[i]);
-        if (prop.name !== val) {
-          generationContext.write(
-            `${rootNode.identifier}.${prop.name} = ${val};`
-          );
-        }
-      }
-    }
-    generationContext.write(`return ${this.generateExpression(generationContext, dag, rootNodeID)};`);
-  },
-  generateExpression(generationContext, dag, nodeID) {
-    const node = getNodeDataFromID(dag, nodeID);
-    if (generationContext.tempNames?.[nodeID]) {
-      return generationContext.tempNames[nodeID];
-    }
-    switch (node.nodeType) {
-      case NodeType.LITERAL:
-      if (node.baseType === BaseType.FLOAT) {
-        return node.value.toFixed(4);
-      }
-      else {
-        return node.value;
-      }
-      case NodeType.VARIABLE:
-      // Track shared variable usage context
-      if (generationContext.shaderContext && generationContext.strandsContext?.sharedVariables?.has(node.identifier)) {
-        const sharedVar = generationContext.strandsContext.sharedVariables.get(node.identifier);
-        if (generationContext.shaderContext === 'vertex') {
-          sharedVar.usedInVertex = true;
-        } else if (generationContext.shaderContext === 'fragment') {
-          sharedVar.usedInFragment = true;
-        }
-      }
-      return node.identifier;
-      case NodeType.OPERATION:
-      const useParantheses = node.usedBy.length > 0;
-      if (node.opCode === OpCode.Nary.CONSTRUCTOR) {
-        // TODO: differentiate casts and constructors for more efficient codegen.
-        // if (node.dependsOn.length === 1 && node.dimension === 1) {
-        //   return this.generateExpression(generationContext, dag, node.dependsOn[0]);
-        // }
-        if (node.baseType === BaseType.SAMPLER2D) {
-          return this.generateExpression(generationContext, dag, node.dependsOn[0]);
-        }
-        const T = this.getTypeName(node.baseType, node.dimension);
-        const deps = node.dependsOn.map((dep) => this.generateExpression(generationContext, dag, dep));
-        return `${T}(${deps.join(', ')})`;
-      }
-      if (node.opCode === OpCode.Nary.FUNCTION_CALL) {
-        const functionArgs = node.dependsOn.map(arg =>this.generateExpression(generationContext, dag, arg));
-        return `${node.identifier}(${functionArgs.join(', ')})`;
-      }
-      if (node.opCode === OpCode.Binary.MEMBER_ACCESS) {
-        const [lID, rID] = node.dependsOn;
-        const lName = this.generateExpression(generationContext, dag, lID);
-        const rName = this.generateExpression(generationContext, dag, rID);
-        return `${lName}.${rName}`;
-      }
-      if (node.opCode === OpCode.Unary.SWIZZLE) {
-        const parentID = node.dependsOn[0];
-        const parentExpr = this.generateExpression(generationContext, dag, parentID);
-        return `${parentExpr}.${node.swizzle}`;
-      }
-      if (node.dependsOn.length === 2) {
-        const [lID, rID] = node.dependsOn;
-        const left  = this.generateExpression(generationContext, dag, lID);
-        const right = this.generateExpression(generationContext, dag, rID);
-
-        // Special case for modulo: use mod() function for floats in GLSL
-        if (node.opCode === OpCode.Binary.MODULO) {
-          const leftNode = getNodeDataFromID(dag, lID);
-          const rightNode = getNodeDataFromID(dag, rID);
-          // If either operand is float, use mod() function
-          if (leftNode.baseType === BaseType.FLOAT || rightNode.baseType === BaseType.FLOAT) {
-            return `mod(${left}, ${right})`;
-          }
-          // For integers, use % operator
-          return `(${left} % ${right})`;
-        }
-
-        const opSym = OpCodeToSymbol[node.opCode];
-        if (useParantheses) {
-          return `(${left} ${opSym} ${right})`;
-        } else {
-          return `${left} ${opSym} ${right}`;
-        }
-      }
-      if (node.opCode === OpCode.Unary.LOGICAL_NOT
-        || node.opCode === OpCode.Unary.NEGATE
-        || node.opCode === OpCode.Unary.PLUS
-        ) {
-        const [i] = node.dependsOn;
-        const val  = this.generateExpression(generationContext, dag, i);
-        const sym  = OpCodeToSymbol[node.opCode];
-        return `${sym}${val}`;
-      }
-      case NodeType.PHI:
-      // Phi nodes represent conditional merging of values
-      // If this phi node has an identifier (like varying variables), use that
-      if (node.identifier) {
-        return node.identifier;
-      }
-      // Otherwise, they should have been declared as temporary variables
-      // and assigned in the appropriate branches
-      if (generationContext.tempNames?.[nodeID]) {
-        return generationContext.tempNames[nodeID];
-      } else {
-        // If no temp was created, this phi node only has one input
-        // so we can just use that directly
-        const validInputs = node.dependsOn.filter(id => id !== null);
-        if (validInputs.length > 0) {
-          return this.generateExpression(generationContext, dag, validInputs[0]);
-        } else {
-          throw new Error(`No valid inputs for node`)
-        }
-      }
-      case NodeType.ASSIGNMENT:
-      internalError(`ASSIGNMENT nodes should not be used as expressions`);
-      default:
-      internalError(`${NodeTypeToName[node.nodeType]} code generation not implemented yet`);
-    }
-  },
-  generateBlock(blockID, strandsContext, generationContext) {
-    const type = strandsContext.cfg.blockTypes[blockID];
-    const handler = cfgHandlers[type] || cfgHandlers[BlockType.DEFAULT];
-    handler.call(cfgHandlers, blockID, strandsContext, generationContext);
-  },
-
-  createGetTextureCall(strandsContext, args) {
-    // In GLSL, getTexture is straightforward - just pass through the args
-    // First argument should be a texture (sampler2D), second should be coordinates
-    const { id, dimension } = functionCallNode(strandsContext, 'getTexture', args, {
-      overloads: [{
-        params: [DataType.sampler2D, DataType.float2],
-        returnType: DataType.float4
-      }]
-    });
-    return { id, dimension };
-  },
-
-  instanceIdReference() {
-    return 'gl_InstanceID';
-  },
-};
-
-export { glslBackend };

package/dist/webgl/text.js

@@ -1,15 +1,16 @@
-import { h as TEXTURE, c as TRIANGLES } from '../constants-BdTiYOQI.js';
-import { R as Renderer3D } from '../rendering-CC8JNTwG.js';
+import { a7 as TEXTURE, c as TRIANGLES } from '../constants-0wkVUfqa.js';
+import { R as Renderer3D } from '../rendering-ltTIxpF2.js';
 import { Vector } from '../math/p5.Vector.js';
 import { Geometry } from './p5.Geometry.js';
 import { Font, arrayCommandsToObjects } from '../type/p5.Font.js';
-import '../creating_reading-C7hu6sg1.js';
+import '../creating_reading-DLkHH80h.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
+import '../strands/ir_types.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-BmD2P6Wv.js';
+import '../p5.Renderer-CQI8PO1F.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';
@@ -23,7 +24,6 @@ import '../shape/vertex.js';
 import '../color/setting.js';
 import 'omggif';
 import '../io/csv.js';
-import 'gifenc';
 import '../image/pixels.js';
 import '../core/transform.js';
 import './GeometryBuilder.js';

package/dist/webgl/utils.js

@@ -1,12 +1,13 @@
-import '../constants-BdTiYOQI.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-CC8JNTwG.js';
-import '../creating_reading-C7hu6sg1.js';
+import '../constants-0wkVUfqa.js';
+import '../strands/ir_types.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-ltTIxpF2.js';
+import '../creating_reading-DLkHH80h.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-BmD2P6Wv.js';
+import '../p5.Renderer-CQI8PO1F.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';
@@ -21,7 +22,6 @@ import '../shape/vertex.js';
 import '../color/setting.js';
 import 'omggif';
 import '../io/csv.js';
-import 'gifenc';
 import '../image/pixels.js';
 import '../core/transform.js';
 import './GeometryBuilder.js';

package/dist/webgl2Compatibility-DA7DLMuq.js

@@ -0,0 +1,7 @@
+var filterBaseFrag = "precision highp float;\n\nuniform sampler2D tex0;\nuniform vec2 canvasSize;\nuniform vec2 texelSize;\n\nIN vec2 vTexCoord;\n\nstruct FilterInputs {\n  vec2 texCoord;\n  vec2 canvasSize;\n  vec2 texelSize;\n};\n\nvoid main(void) {\n  FilterInputs inputs;\n  inputs.texCoord = vTexCoord;\n  inputs.canvasSize = canvasSize;\n  inputs.texelSize = texelSize;\n  OUT_COLOR = HOOK_getColor(inputs, tex0);\n  OUT_COLOR.rgb *= outColor.a;\n}\n";
+
+var filterBaseVert = "precision highp int;\n\nuniform mat4 uModelViewMatrix;\nuniform mat4 uProjectionMatrix;\n\nIN vec3 aPosition;\nIN vec2 aTexCoord;\nOUT vec2 vTexCoord;\n\nvoid main() {\n  // transferring texcoords for the frag shader\n  vTexCoord = aTexCoord;\n\n  // copy position with a fourth coordinate for projection (1.0 is normal)\n  vec4 positionVec4 = vec4(aPosition, 1.0);\n\n  // project to 3D space\n  gl_Position = uProjectionMatrix * uModelViewMatrix * positionVec4;\n}\n";
+
+var webgl2CompatibilityShader = "#ifdef WEBGL2\n\n#define IN in\n#define OUT out\n\n#ifdef FRAGMENT_SHADER\nout vec4 outColor;\n#define OUT_COLOR outColor\n#endif\n#define TEXTURE texture\n\n#else\n\n#ifdef FRAGMENT_SHADER\n#define IN varying\n#else\n#define IN attribute\n#endif\n#define OUT varying\n#define TEXTURE texture2D\n\n#ifdef FRAGMENT_SHADER\n#define OUT_COLOR gl_FragColor\n#endif\n\n#endif\n\nvec4 getTexture(in sampler2D content, vec2 coord) {\n  vec4 color = TEXTURE(content, coord);\n  if (color.a > 0.) color.rgb /= color.a;\n  return color;\n}\n";
+
+export { filterBaseFrag as a, filterBaseVert as f, webgl2CompatibilityShader as w };

package/dist/webgpu/index.js

@@ -1,5 +1,5 @@
 import rendererWebGPU from './p5.RendererWebGPU.js';
-import '../constants-BdTiYOQI.js';
+import '../constants-0wkVUfqa.js';
 import '../webgl/enums.js';
 import '../strands/ir_types.js';
 import './shaders/color.js';
@@ -8,14 +8,18 @@ import './shaders/material.js';
 import './shaders/font.js';
 import './shaders/blit.js';
 import './strands_wgslBackend.js';
+import './shaders/functions/noise3DWGSL.js';
+import './shaders/functions/randomWGSL.js';
+import './shaders/functions/randomVertWGSL.js';
+import './shaders/functions/randomComputeWGSL.js';
 import '../strands/ir_dag.js';
 import '../strands/strands_FES.js';
-import '../ir_builders-Cd6rU9Vm.js';
+import '../ir_builders-C2ebb6Lu.js';
 import '../strands/ir_cfg.js';
 import '../strands/strands_builtins.js';
-import './shaders/functions/noise3DWGSL.js';
 import './shaders/filters/base.js';
 import './shaders/imageLight.js';
+import './shaders/compute.js';
 
 function index(p5){
   p5.registerAddon(rendererWebGPU);