Cleanup

Author: davepagurek

src/strands/strands_api.js

@@ -152,23 +152,23 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
     // Shared variables with smart context detection
     fn[`shared${pascalTypeName}`] = function(name) {
       const { id, dimension } = build.variableNode(strandsContext, typeInfo, name);
-      
+
       // Initialize shared variables tracking if not present
       if (!strandsContext.sharedVariables) {
         strandsContext.sharedVariables = new Map();
       }
-      
+
       // Track this shared variable for smart declaration generation
       strandsContext.sharedVariables.set(name, {
         typeInfo,
         usedInVertex: false,
         usedInFragment: false,
         declared: false
       });
-      
+
       return createStrandsNode(id, dimension, strandsContext);
     };
-    
+
     // Alias varying* as shared* for backward compatibility
     fn[`varying${pascalTypeName}`] = fn[`shared${pascalTypeName}`];
     if (pascalTypeName.startsWith('Vec')) {
@@ -293,13 +293,13 @@ export function createShaderHooksFunctions(strandsContext, fn, shader) {
   const fragmentHooksWithContext = Object.fromEntries(
     Object.entries(shader.hooks.fragment).map(([name, hook]) => [name, { ...hook, shaderContext: 'fragment' }])
   );
-  
+
   const availableHooks = {
     ...vertexHooksWithContext,
     ...fragmentHooksWithContext,
   }
   const hookTypes = Object.keys(availableHooks).map(name => shader.hookTypes(name));
-  
+
   const { cfg, dag } = strandsContext;
   for (const hookType of hookTypes) {
     const hookImplementation = function(hookUserCallback) {

src/strands/strands_codegen.js

@@ -46,7 +46,7 @@ export function generateShaderCode(strandsContext) {
         generationContext.visitedNodes.add(assignmentNodeID);
       }
     }
-    
+
     // Reset global assignments for next hook
     strandsContext.globalAssignments = [];
 

src/strands/strands_glslBackend.js

@@ -200,12 +200,12 @@ export const glslBackend = {
     // 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}`);

src/strands/strands_node.js

@@ -7,7 +7,7 @@ export class StrandsNode {
     this.id = id;
     this.strandsContext = strandsContext;
     this.dimension = dimension;
-    
+
     // Store original identifier for varying variables
     const dag = this.strandsContext.dag;
     const nodeData = getNodeDataFromID(dag, this.id);
@@ -24,7 +24,7 @@ export class StrandsNode {
     const { dag, cfg } = this.strandsContext;
     const orig = getNodeDataFromID(dag, this.id);
     const baseType = orig?.baseType ?? BaseType.FLOAT;
-    
+
     let newValueID;
     if (value instanceof StrandsNode) {
       newValueID = value.id;
@@ -36,7 +36,7 @@ export class StrandsNode {
       );
       newValueID = newVal.id;
     }
-    
+
     // For varying variables, we need both assignment generation AND a way to reference by identifier
     if (this._originalIdentifier) {
       // Create a variable node for the target (the varying variable)
@@ -45,7 +45,7 @@ export class StrandsNode {
         { baseType: this._originalBaseType, dimension: this._originalDimension },
         this._originalIdentifier
       );
-      
+
       // Create assignment node for GLSL generation
       const assignmentNode = createNodeData({
         nodeType: NodeType.ASSIGNMENT,
@@ -54,10 +54,10 @@ export 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({
@@ -67,19 +67,19 @@ export class StrandsNode {
         identifier: this._originalIdentifier
       });
       const variableID = getOrCreateNode(dag, variableNodeData);
-      
+
       this.id = variableID; // Point to the variable node for expression generation
     } else {
       this.id = newValueID; // For non-varying variables, just update to new value
     }
-    
+
     return this;
   }
   bridgeSwizzle(swizzlePattern, value) {
     const { dag, cfg } = this.strandsContext;
     const orig = getNodeDataFromID(dag, this.id);
     const baseType = orig?.baseType ?? BaseType.FLOAT;
-    
+
     let newValueID;
     if (value instanceof StrandsNode) {
       newValueID = value.id;
@@ -91,7 +91,7 @@ export class StrandsNode {
       );
       newValueID = newVal.id;
     }
-    
+
     // For varying variables, create swizzle assignment
     if (this._originalIdentifier) {
       // Create a variable node for the target with swizzle
@@ -100,7 +100,7 @@ export class StrandsNode {
         { baseType: this._originalBaseType, dimension: this._originalDimension },
         this._originalIdentifier
       );
-      
+
       // Create a swizzle node for the target (myVarying.xyz)
       const swizzleNode = createNodeData({
         nodeType: NodeType.OPERATION,
@@ -111,7 +111,7 @@ export class StrandsNode {
         dependsOn: [targetVarID]
       });
       const swizzleID = getOrCreateNode(dag, swizzleNode);
-      
+
       // Create assignment node: myVarying.xyz = value
       const assignmentNode = createNodeData({
         nodeType: NodeType.ASSIGNMENT,
@@ -120,10 +120,10 @@ export 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({
@@ -133,12 +133,12 @@ export class StrandsNode {
         identifier: this._originalIdentifier
       });
       const variableID = getOrCreateNode(dag, variableNodeData);
-      
+
       this.id = variableID; // Point to the variable node, not the assignment node
     } else {
       this.id = newValueID; // For non-varying variables, just update to new value
     }
-    
+
     return this;
   }
   getValue() {
@@ -150,7 +150,7 @@ export class StrandsNode {
       );
       return createStrandsNode(id, dimension, this.strandsContext);
     }
-    
+
     return this;
   }
 }

src/strands/strands_transpiler.js

@@ -201,7 +201,7 @@ const ASTCallbacks = {
       // Note: node.left.object might be worldPos.getValue() due to prior Identifier transformation
       else if (node.left.type === 'MemberExpression') {
         let varyingName = null;
-        
+
         // Check if it's a direct identifier: myVarying.xyz
         if (node.left.object.type === 'Identifier' && _state.varyings[node.left.object.name]) {
           varyingName = node.left.object.name;
@@ -215,7 +215,7 @@ const ASTCallbacks = {
                  _state.varyings[node.left.object.expression.callee.object.name]) {
           varyingName = node.left.object.expression.callee.object.name;
         }
-        
+
         if (varyingName) {
           const swizzlePattern = node.left.property.name;
           node.type = 'ExpressionStatement';