Fix Vector aliases

Author: davepagurek

src/strands/strands_api.js

@@ -163,6 +163,8 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
         + typeInfo.fnName.slice(1);
       if (pascalTypeName === 'Sampler2D') {
         typeAliases.push('Texture')
+      } else if (/^vec/.test(typeInfo.fnName)) {
+        typeAliases.push(pascalTypeName.replace('Vec', 'Vector'));
       }
     }
     fn[`uniform${pascalTypeName}`] = function(name, defaultValue) {
@@ -192,7 +194,9 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
 
     // Alias varying* as shared* for backward compatibility
     fn[`varying${pascalTypeName}`] = fn[`shared${pascalTypeName}`];
+
     for (const typeAlias of typeAliases) {
+      console.log(`Aliasing ${typeAlias} to ${pascalTypeName}`)
       // For compatibility, also alias uniformVec2 as uniformVector2, what we initially
       // documented these as
       fn[`uniform${typeAlias}`] = fn[`uniform${pascalTypeName}`];

test/types/strands.ts

@@ -29,6 +29,11 @@ function fresnelShaderCallback() {
 function starShaderCallback() {
   const time = uniformFloat(() => millis());
   const skyRadius = uniformFloat(250);
+  const testVec = uniformVector2(() => 123);
+  const testSharedVec = sharedVec2();
+  const testSharedVector = sharedVector2();
+  const testVaryingVec = varyingVec2();
+  const testVaryingVector = varyingVector2();
 
   function rand2(st) {
     return fract(sin(dot(st, [12.9898, 78.233])) * 43758.5453123);

test/unit/webgl/p5.Shader.js

@@ -543,7 +543,6 @@ suite('p5.Shader', function() {
         myp5.createCanvas(100, 50, myp5.WEBGL);
         const testShader = myp5.baseMaterialShader().modify(() => {
           myp5.getPixelInputs(inputs => {
-            debugger
             const uv = inputs.texCoord;
             const condition = uv.x > 0.5; // left half false, right half true
             let color = myp5.float(0.0);

utils/typescript.mjs

@@ -103,6 +103,8 @@ function processStrandsFunctions() {
         + typeInfo.fnName.slice(1);
       if (pascalTypeName === 'Sampler2D') {
         typeAliases.push('Texture')
+      } else if (/^vec/.test(typeInfo.fnName)) {
+        typeAliases.push(pascalTypeName.replace('Vec', 'Vector'));
       }
     }