p5 2.3.0 → 2.3.1-rc.1

package/lib/p5.webgpu.esm.js

@@ -11,7 +11,7 @@ const _PI = Math.PI;
  * @property {String} VERSION
  * @final
  */
-const VERSION = '2.3.0';
+const VERSION = '2.3.1-rc.1';
 
 // GRAPHICS RENDERER
 /**
@@ -3057,6 +3057,13 @@ function userError(errorType, errorMessage) {
     throw new Error(prefixedMessage);
 }
 
+function dimensionMismatchError(declaredDim,actualDim,varName){
+    userError(
+        'dimension mismatch',
+    `Cannot assign a value of dimension ${actualDim} to \`${varName}\`, which expects dimension ${declaredDim}.`
+    );
+}
+
 function getOrCreateNode(graph, node) {
   // const key = getNodeKey(node);
   // const existing = graph.cache.get(key);
@@ -3224,6 +3231,16 @@ class StrandsNode {
 
     // For varying variables, we need both assignment generation AND a way to reference by identifier
     if (this._originalIdentifier) {
+      const valueDim = value?.isStrandsNode
+        ? value.dimension
+        : (Array.isArray(value) ? value.length : 1);
+      if (valueDim !== this._originalDimension && valueDim !== 1){
+        dimensionMismatchError(
+          this._originalDimension,
+          valueDim,
+          this._originalIdentifier
+        );
+      }
       // Create a variable node for the target (the varying variable)
       const { id: targetVarID } = variableNode(
         this.strandsContext,
@@ -3276,6 +3293,16 @@ class StrandsNode {
 
     // For varying variables, create swizzle assignment
     if (this._originalIdentifier) {
+      const valueDim = value?.isStrandsNode
+        ? value.dimension
+        : (Array.isArray(value) ? value.length : 1);
+      if (valueDim !== swizzlePattern.length && valueDim !== 1){
+        dimensionMismatchError(
+          swizzlePattern.length,
+          valueDim,
+          `${this._originalIdentifier}.${swizzlePattern}`
+        );
+      }
       // Create a variable node for the target with swizzle
       const { id: targetVarID } = variableNode(
         this.strandsContext,
@@ -3839,7 +3866,11 @@ function swizzleTrap(id, dimension, strandsContext, onRebind) {
             scalars.push(createStrandsNode(id, dimension, strandsContext));
           }
         } else {
-          userError('type error', `Swizzle assignment: RHS vector does not match LHS vector (need ${chars.length}, got ${value.dimension}).`);
+          dimensionMismatchError(
+            chars.length,
+            value.dimension,
+            `${target._originalIdentifier || 'value'}.${property}`
+          );
         }
       } else if (Array.isArray(value)) {
         const flat = value.flat(Infinity);
@@ -4472,7 +4503,7 @@ const wgslBackend = {
     }
     const dag = strandsContext.dag;
     const rootNode = getNodeDataFromID(dag, rootNodeID);
-    if (isStructType(returnType)) {
+    if (isStructType(returnType) && rootNode.identifier) {
       const structTypeInfo = returnType;
       for (let i = 0; i < structTypeInfo.properties.length; i++) {
         const prop = structTypeInfo.properties[i];

package/lib/p5.webgpu.js

@@ -14,7 +14,7 @@
    * @property {String} VERSION
    * @final
    */
-  const VERSION = '2.3.0';
+  const VERSION = '2.3.1-rc.1';
 
   // GRAPHICS RENDERER
   /**
@@ -3060,6 +3060,13 @@ fn random(seed: f32, invocationId: vec3<u32>) -> f32 {
       throw new Error(prefixedMessage);
   }
 
+  function dimensionMismatchError(declaredDim,actualDim,varName){
+      userError(
+          'dimension mismatch',
+      `Cannot assign a value of dimension ${actualDim} to \`${varName}\`, which expects dimension ${declaredDim}.`
+      );
+  }
+
   function getOrCreateNode(graph, node) {
     // const key = getNodeKey(node);
     // const existing = graph.cache.get(key);
@@ -3227,6 +3234,16 @@ fn random(seed: f32, invocationId: vec3<u32>) -> f32 {
 
       // For varying variables, we need both assignment generation AND a way to reference by identifier
       if (this._originalIdentifier) {
+        const valueDim = value?.isStrandsNode
+          ? value.dimension
+          : (Array.isArray(value) ? value.length : 1);
+        if (valueDim !== this._originalDimension && valueDim !== 1){
+          dimensionMismatchError(
+            this._originalDimension,
+            valueDim,
+            this._originalIdentifier
+          );
+        }
         // Create a variable node for the target (the varying variable)
         const { id: targetVarID } = variableNode(
           this.strandsContext,
@@ -3279,6 +3296,16 @@ fn random(seed: f32, invocationId: vec3<u32>) -> f32 {
 
       // For varying variables, create swizzle assignment
       if (this._originalIdentifier) {
+        const valueDim = value?.isStrandsNode
+          ? value.dimension
+          : (Array.isArray(value) ? value.length : 1);
+        if (valueDim !== swizzlePattern.length && valueDim !== 1){
+          dimensionMismatchError(
+            swizzlePattern.length,
+            valueDim,
+            `${this._originalIdentifier}.${swizzlePattern}`
+          );
+        }
         // Create a variable node for the target with swizzle
         const { id: targetVarID } = variableNode(
           this.strandsContext,
@@ -3842,7 +3869,11 @@ fn random(seed: f32, invocationId: vec3<u32>) -> f32 {
               scalars.push(createStrandsNode(id, dimension, strandsContext));
             }
           } else {
-            userError('type error', `Swizzle assignment: RHS vector does not match LHS vector (need ${chars.length}, got ${value.dimension}).`);
+            dimensionMismatchError(
+              chars.length,
+              value.dimension,
+              `${target._originalIdentifier || 'value'}.${property}`
+            );
           }
         } else if (Array.isArray(value)) {
           const flat = value.flat(Infinity);
@@ -4475,7 +4506,7 @@ fn random(seed: f32, invocationId: vec3<u32>) -> f32 {
       }
       const dag = strandsContext.dag;
       const rootNode = getNodeDataFromID(dag, rootNodeID);
-      if (isStructType(returnType)) {
+      if (isStructType(returnType) && rootNode.identifier) {
         const structTypeInfo = returnType;
         for (let i = 0; i < structTypeInfo.properties.length; i++) {
           const prop = structTypeInfo.properties[i];