p5 2.2.2 → 2.2.3-rc.1

package/lib/p5.webgpu.esm.js

@@ -11,7 +11,7 @@ const _PI = Math.PI;
  * @property {String} VERSION
  * @final
  */
-const VERSION = '2.2.2';
+const VERSION = '2.2.3-rc.1';
 
 // GRAPHICS RENDERER
 /**
@@ -1459,6 +1459,7 @@ const BaseType = {
   BOOL: "bool",
   MAT: "mat",
   DEFER: "defer",
+  ASSIGN_ON_USE: "assign_on_use",
   SAMPLER2D: "sampler2D",
   SAMPLER: "sampler",
 };
@@ -1468,6 +1469,7 @@ const BasePriority = {
   [BaseType.BOOL]: 1,
   [BaseType.MAT]: 0,
   [BaseType.DEFER]: -1,
+  [BaseType.ASSIGN_ON_USE]: -2,
   [BaseType.SAMPLER2D]: -10,
   [BaseType.SAMPLER]: -11,
 };
@@ -1488,6 +1490,7 @@ const DataType = {
   mat3: { fnName: "mat3x3", baseType: BaseType.MAT, dimension:3, priority: 0,  },
   mat4: { fnName: "mat4x4", baseType: BaseType.MAT, dimension:4, priority: 0,  },
   defer: { fnName:  null, baseType: BaseType.DEFER, dimension: null, priority: -1 },
+  assign_on_use: { fnName: null, baseType: BaseType.ASSIGN_ON_USE, dimension: null, priority: -2 },
   sampler2D: { fnName: "sampler2D", baseType: BaseType.SAMPLER2D, dimension: 1, priority: -10 },
   sampler: { fnName: "sampler", baseType: BaseType.SAMPLER, dimension: 1, priority: -11 },
 };
@@ -1535,7 +1538,7 @@ const OpCode = {
     CONSTRUCTOR: 201,
   }};
 const OperatorTable = [
-  { arity: "unary", name: "not", symbol: "!", opCode: OpCode.Unary.LOGICAL_NOT },
+  { arity: "unary", boolean: true, name: "not", symbol: "!", opCode: OpCode.Unary.LOGICAL_NOT },
   { arity: "unary", name: "neg", symbol: "-", opCode: OpCode.Unary.NEGATE },
   { arity: "unary", name: "plus", symbol: "+", opCode: OpCode.Unary.PLUS },
   { arity: "binary", name: "add", symbol: "+", opCode: OpCode.Binary.ADD },
@@ -1543,18 +1546,18 @@ const OperatorTable = [
   { arity: "binary", name: "mult", symbol: "*", opCode: OpCode.Binary.MULTIPLY },
   { arity: "binary", name: "div", symbol: "/", opCode: OpCode.Binary.DIVIDE },
   { arity: "binary", name: "mod", symbol: "%", opCode: OpCode.Binary.MODULO },
-  { arity: "binary", name: "equalTo", symbol: "==", opCode: OpCode.Binary.EQUAL },
-  { arity: "binary", name: "notEqual", symbol: "!=", opCode: OpCode.Binary.NOT_EQUAL },
-  { arity: "binary", name: "greaterThan", symbol: ">", opCode: OpCode.Binary.GREATER_THAN },
-  { arity: "binary", name: "greaterEqual", symbol: ">=", opCode: OpCode.Binary.GREATER_EQUAL },
-  { arity: "binary", name: "lessThan", symbol: "<", opCode: OpCode.Binary.LESS_THAN },
-  { arity: "binary", name: "lessEqual", symbol: "<=", opCode: OpCode.Binary.LESS_EQUAL },
-  { arity: "binary", name: "and", symbol: "&&", opCode: OpCode.Binary.LOGICAL_AND },
-  { arity: "binary", name: "or", symbol: "||", opCode: OpCode.Binary.LOGICAL_OR },
+  { arity: "binary", boolean: true, name: "equalTo", symbol: "==", opCode: OpCode.Binary.EQUAL },
+  { arity: "binary", boolean: true, name: "notEqual", symbol: "!=", opCode: OpCode.Binary.NOT_EQUAL },
+  { arity: "binary", boolean: true, name: "greaterThan", symbol: ">", opCode: OpCode.Binary.GREATER_THAN },
+  { arity: "binary", boolean: true, name: "greaterEqual", symbol: ">=", opCode: OpCode.Binary.GREATER_EQUAL },
+  { arity: "binary", boolean: true, name: "lessThan", symbol: "<", opCode: OpCode.Binary.LESS_THAN },
+  { arity: "binary", boolean: true, name: "lessEqual", symbol: "<=", opCode: OpCode.Binary.LESS_EQUAL },
+  { arity: "binary", boolean: true, name: "and", symbol: "&&", opCode: OpCode.Binary.LOGICAL_AND },
+  { arity: "binary", boolean: true, name: "or", symbol: "||", opCode: OpCode.Binary.LOGICAL_OR },
 ];
 // export const SymbolToOpCode = {};
 const OpCodeToSymbol = {};
-for (const { symbol, opCode, name, arity } of OperatorTable) {
+for (const { symbol, opCode, name, arity, boolean } of OperatorTable) {
   // SymbolToOpCode[symbol] = opCode;
   OpCodeToSymbol[opCode] = symbol;
 }
@@ -3036,9 +3039,6 @@ class StrandsNode {
       const assignmentID = getOrCreateNode(dag, assignmentNode);
       recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-      // Track for global assignments processing
-      this.strandsContext.globalAssignments.push(assignmentID);
-
       // Simply update this node to be a variable node with the identifier
       // This ensures it always generates the variable name in expressions
       const variableNodeData = createNodeData({
@@ -3102,9 +3102,6 @@ class StrandsNode {
       const assignmentID = getOrCreateNode(dag, assignmentNode);
       recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-      // Track for global assignments processing in the current hook context
-      this.strandsContext.globalAssignments.push(assignmentID);
-
       // Simply update this node to be a variable node with the identifier
       // This ensures it always generates the variable name in expressions
       const variableNodeData = createNodeData({
@@ -3319,6 +3316,17 @@ function mapPrimitiveDepsToIDs(strandsContext, typeInfo, dependsOn) {
       calculatedDimensions += dimension;
       continue;
     }
+    else if (typeof dep === 'boolean') {
+      // Handle boolean literals - convert to bool type
+      const { id, dimension } = scalarLiteralNode(strandsContext, { dimension: 1, baseType: BaseType.BOOL }, dep);
+      mappedDependencies.push(id);
+      calculatedDimensions += dimension;
+      // Update baseType to BOOL if it was inferred
+      if (baseType !== BaseType.BOOL) {
+        baseType = BaseType.BOOL;
+      }
+      continue;
+    }
     else {
       userError('type error', `You've tried to construct a scalar or vector type with a non-numeric value: ${dep}`);
     }
@@ -3369,7 +3377,12 @@ function primitiveConstructorNode(strandsContext, typeInfo, dependsOn) {
   const { mappedDependencies, inferredTypeInfo } = mapPrimitiveDepsToIDs(strandsContext, typeInfo, dependsOn);
 
   const finalType = {
-    baseType: typeInfo.baseType,
+    // We might have inferred a non numeric type. Currently this is
+    // just used for booleans. Maybe this needs to be something more robust
+    // if we ever want to support inference of e.g. int vectors?
+    baseType: inferredTypeInfo.baseType === BaseType.BOOL
+      ? BaseType.BOOL
+      : typeInfo.baseType,
     dimension: inferredTypeInfo.dimension
   };
 
@@ -3690,10 +3703,10 @@ const cfgHandlers = {
         // Initialize with default value - WGSL requires initialization
         let defaultValue;
         if (T.dimension === 1) {
-          defaultValue = T.baseType === 'float' ? '0.0' : '0';
+          defaultValue = this.defaultScalarValue(T.baseType);
         } else {
           // For vector types, use constructor with repeated scalar values
-          const scalarDefault = T.baseType === 'float' ? '0.0' : '0';
+          const scalarDefault = this.defaultScalarValue(T.baseType);
           const components = Array(T.dimension).fill(scalarDefault).join(', ');
           defaultValue = `${typeName}(${components})`;
         }
@@ -3702,6 +3715,15 @@ const cfgHandlers = {
     }
     this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
   },
+  defaultScalarValue(baseType) {
+    if (baseType === BaseType.FLOAT) {
+      return '0.0';
+    } else if (baseType === BaseType.BOOL) {
+      return 'false';
+    } else {
+      return '0';
+    }
+  },
   [BlockType.IF_COND](blockID, strandsContext, generationContext) {
     const { dag, cfg } = strandsContext;
     const conditionID = cfg.blockConditions[blockID];
@@ -4081,7 +4103,7 @@ const wgslBackend = {
         if (validInputs.length > 0) {
           return this.generateExpression(generationContext, dag, validInputs[0]);
         } else {
-          throw new Error(`No valid inputs for node`)
+          throw new Error('No valid inputs for node');
         }
       }
       case NodeType.ASSIGNMENT:

package/lib/p5.webgpu.js

@@ -14,7 +14,7 @@
    * @property {String} VERSION
    * @final
    */
-  const VERSION = '2.2.2';
+  const VERSION = '2.2.3-rc.1';
 
   // GRAPHICS RENDERER
   /**
@@ -1462,6 +1462,7 @@
     BOOL: "bool",
     MAT: "mat",
     DEFER: "defer",
+    ASSIGN_ON_USE: "assign_on_use",
     SAMPLER2D: "sampler2D",
     SAMPLER: "sampler",
   };
@@ -1471,6 +1472,7 @@
     [BaseType.BOOL]: 1,
     [BaseType.MAT]: 0,
     [BaseType.DEFER]: -1,
+    [BaseType.ASSIGN_ON_USE]: -2,
     [BaseType.SAMPLER2D]: -10,
     [BaseType.SAMPLER]: -11,
   };
@@ -1491,6 +1493,7 @@
     mat3: { fnName: "mat3x3", baseType: BaseType.MAT, dimension:3, priority: 0,  },
     mat4: { fnName: "mat4x4", baseType: BaseType.MAT, dimension:4, priority: 0,  },
     defer: { fnName:  null, baseType: BaseType.DEFER, dimension: null, priority: -1 },
+    assign_on_use: { fnName: null, baseType: BaseType.ASSIGN_ON_USE, dimension: null, priority: -2 },
     sampler2D: { fnName: "sampler2D", baseType: BaseType.SAMPLER2D, dimension: 1, priority: -10 },
     sampler: { fnName: "sampler", baseType: BaseType.SAMPLER, dimension: 1, priority: -11 },
   };
@@ -1538,7 +1541,7 @@
       CONSTRUCTOR: 201,
     }};
   const OperatorTable = [
-    { arity: "unary", name: "not", symbol: "!", opCode: OpCode.Unary.LOGICAL_NOT },
+    { arity: "unary", boolean: true, name: "not", symbol: "!", opCode: OpCode.Unary.LOGICAL_NOT },
     { arity: "unary", name: "neg", symbol: "-", opCode: OpCode.Unary.NEGATE },
     { arity: "unary", name: "plus", symbol: "+", opCode: OpCode.Unary.PLUS },
     { arity: "binary", name: "add", symbol: "+", opCode: OpCode.Binary.ADD },
@@ -1546,18 +1549,18 @@
     { arity: "binary", name: "mult", symbol: "*", opCode: OpCode.Binary.MULTIPLY },
     { arity: "binary", name: "div", symbol: "/", opCode: OpCode.Binary.DIVIDE },
     { arity: "binary", name: "mod", symbol: "%", opCode: OpCode.Binary.MODULO },
-    { arity: "binary", name: "equalTo", symbol: "==", opCode: OpCode.Binary.EQUAL },
-    { arity: "binary", name: "notEqual", symbol: "!=", opCode: OpCode.Binary.NOT_EQUAL },
-    { arity: "binary", name: "greaterThan", symbol: ">", opCode: OpCode.Binary.GREATER_THAN },
-    { arity: "binary", name: "greaterEqual", symbol: ">=", opCode: OpCode.Binary.GREATER_EQUAL },
-    { arity: "binary", name: "lessThan", symbol: "<", opCode: OpCode.Binary.LESS_THAN },
-    { arity: "binary", name: "lessEqual", symbol: "<=", opCode: OpCode.Binary.LESS_EQUAL },
-    { arity: "binary", name: "and", symbol: "&&", opCode: OpCode.Binary.LOGICAL_AND },
-    { arity: "binary", name: "or", symbol: "||", opCode: OpCode.Binary.LOGICAL_OR },
+    { arity: "binary", boolean: true, name: "equalTo", symbol: "==", opCode: OpCode.Binary.EQUAL },
+    { arity: "binary", boolean: true, name: "notEqual", symbol: "!=", opCode: OpCode.Binary.NOT_EQUAL },
+    { arity: "binary", boolean: true, name: "greaterThan", symbol: ">", opCode: OpCode.Binary.GREATER_THAN },
+    { arity: "binary", boolean: true, name: "greaterEqual", symbol: ">=", opCode: OpCode.Binary.GREATER_EQUAL },
+    { arity: "binary", boolean: true, name: "lessThan", symbol: "<", opCode: OpCode.Binary.LESS_THAN },
+    { arity: "binary", boolean: true, name: "lessEqual", symbol: "<=", opCode: OpCode.Binary.LESS_EQUAL },
+    { arity: "binary", boolean: true, name: "and", symbol: "&&", opCode: OpCode.Binary.LOGICAL_AND },
+    { arity: "binary", boolean: true, name: "or", symbol: "||", opCode: OpCode.Binary.LOGICAL_OR },
   ];
   // export const SymbolToOpCode = {};
   const OpCodeToSymbol = {};
-  for (const { symbol, opCode, name, arity } of OperatorTable) {
+  for (const { symbol, opCode, name, arity, boolean } of OperatorTable) {
     // SymbolToOpCode[symbol] = opCode;
     OpCodeToSymbol[opCode] = symbol;
   }
@@ -3039,9 +3042,6 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
         const assignmentID = getOrCreateNode(dag, assignmentNode);
         recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-        // Track for global assignments processing
-        this.strandsContext.globalAssignments.push(assignmentID);
-
         // Simply update this node to be a variable node with the identifier
         // This ensures it always generates the variable name in expressions
         const variableNodeData = createNodeData({
@@ -3105,9 +3105,6 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
         const assignmentID = getOrCreateNode(dag, assignmentNode);
         recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-        // Track for global assignments processing in the current hook context
-        this.strandsContext.globalAssignments.push(assignmentID);
-
         // Simply update this node to be a variable node with the identifier
         // This ensures it always generates the variable name in expressions
         const variableNodeData = createNodeData({
@@ -3322,6 +3319,17 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
         calculatedDimensions += dimension;
         continue;
       }
+      else if (typeof dep === 'boolean') {
+        // Handle boolean literals - convert to bool type
+        const { id, dimension } = scalarLiteralNode(strandsContext, { dimension: 1, baseType: BaseType.BOOL }, dep);
+        mappedDependencies.push(id);
+        calculatedDimensions += dimension;
+        // Update baseType to BOOL if it was inferred
+        if (baseType !== BaseType.BOOL) {
+          baseType = BaseType.BOOL;
+        }
+        continue;
+      }
       else {
         userError('type error', `You've tried to construct a scalar or vector type with a non-numeric value: ${dep}`);
       }
@@ -3372,7 +3380,12 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
     const { mappedDependencies, inferredTypeInfo } = mapPrimitiveDepsToIDs(strandsContext, typeInfo, dependsOn);
 
     const finalType = {
-      baseType: typeInfo.baseType,
+      // We might have inferred a non numeric type. Currently this is
+      // just used for booleans. Maybe this needs to be something more robust
+      // if we ever want to support inference of e.g. int vectors?
+      baseType: inferredTypeInfo.baseType === BaseType.BOOL
+        ? BaseType.BOOL
+        : typeInfo.baseType,
       dimension: inferredTypeInfo.dimension
     };
 
@@ -3693,10 +3706,10 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
           // Initialize with default value - WGSL requires initialization
           let defaultValue;
           if (T.dimension === 1) {
-            defaultValue = T.baseType === 'float' ? '0.0' : '0';
+            defaultValue = this.defaultScalarValue(T.baseType);
           } else {
             // For vector types, use constructor with repeated scalar values
-            const scalarDefault = T.baseType === 'float' ? '0.0' : '0';
+            const scalarDefault = this.defaultScalarValue(T.baseType);
             const components = Array(T.dimension).fill(scalarDefault).join(', ');
             defaultValue = `${typeName}(${components})`;
           }
@@ -3705,6 +3718,15 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
       }
       this[BlockType.DEFAULT](blockID, strandsContext, generationContext);
     },
+    defaultScalarValue(baseType) {
+      if (baseType === BaseType.FLOAT) {
+        return '0.0';
+      } else if (baseType === BaseType.BOOL) {
+        return 'false';
+      } else {
+        return '0';
+      }
+    },
     [BlockType.IF_COND](blockID, strandsContext, generationContext) {
       const { dag, cfg } = strandsContext;
       const conditionID = cfg.blockConditions[blockID];
@@ -4084,7 +4106,7 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
           if (validInputs.length > 0) {
             return this.generateExpression(generationContext, dag, validInputs[0]);
           } else {
-            throw new Error(`No valid inputs for node`)
+            throw new Error('No valid inputs for node');
           }
         }
         case NodeType.ASSIGNMENT: