Merge branch 'dev-2.0' into strands-blocks

Author: davepagurek

src/accessibility/gridOutput.js

@@ -10,6 +10,13 @@ function gridOutput(p5, fn){
 
   //updates gridOutput
   fn._updateGridOutput = function(idT) {
+    if (this._renderer && this._renderer instanceof p5.RendererGL) {
+      if (!this._didOutputGridWebGLMessage) {
+        this._didOutputGridWebGLMessage = true;
+        console.error('gridOutput() does not yet work in WebGL mode.');
+      }
+      return;
+    }
     //if html structure is not there yet
     if (!this.dummyDOM.querySelector(`#${idT}_summary`)) {
       return;

src/accessibility/textOutput.js

@@ -10,6 +10,13 @@ function textOutput(p5, fn){
 
   //updates textOutput
   fn._updateTextOutput = function(idT) {
+    if (this._renderer && this._renderer instanceof p5.RendererGL) {
+      if (!this._didOutputTextWebGLMessage) {
+        this._didOutputTextWebGLMessage = true;
+        console.error('textOutput() does not yet work in WebGL mode.');
+      }
+      return;
+    }
     //if html structure is not there yet
     if (!this.dummyDOM.querySelector(`#${idT}_summary`)) {
       return;

src/math/p5.Vector.js

@@ -3155,7 +3155,7 @@ class Vector {
     if (typeof length === 'undefined') {
       length = 1;
     }
-    return new Vector(length * Math.cos(angle), length * Math.sin(angle), 0);
+    return new Vector(length * Math.cos(angle), length * Math.sin(angle));
   }
 
   /**
@@ -3241,7 +3241,7 @@ class Vector {
    *   // Create a p5.Vector object.
    *   let v = p5.Vector.random2D();
    *
-   *   // Prints "p5.Vector Object : [x, y, 0]" to the console
+   *   // Prints "p5.Vector Object : [x, y]" to the console
    *   // where x and y are small random numbers.
    *   print(v.toString());
    * }

src/strands/strands_api.js

@@ -18,7 +18,8 @@ import * as CFG from './ir_cfg'
 import * as FES from './strands_FES'
 import { getNodeDataFromID } from './ir_dag'
 import { StrandsNode, createStrandsNode } from './strands_node'
-import noiseGLSL from '../webgl/shaders/functions/noiseGLSL.glsl';
+import noiseGLSL from '../webgl/shaders/functions/noise3DGLSL.glsl';
+
 //////////////////////////////////////////////
 // User nodes
 //////////////////////////////////////////////
@@ -111,14 +112,16 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
     strandsContext.fragmentDeclarations.add(noiseGLSL);
     // Handle noise(x, y) as noise(vec2)
     let nodeArgs;
-    if (args.length === 2) {
-      nodeArgs = [fn.vec2(args[0], args[1])];
+    if (args.length === 3) {
+      nodeArgs = [fn.vec3(args[0], args[1], args[2])];
+    } else if (args.length === 2) {
+      nodeArgs = [fn.vec3(args[0], args[1], 0)];
     } else {
       nodeArgs = args;
     }
     const { id, dimension } = build.functionCallNode(strandsContext, 'noise', nodeArgs, {
       overloads: [{
-        params: [DataType.float2],
+        params: [DataType.float3],
         returnType: DataType.float1,
       }]
     });

src/webgl/shaders/functions/noise3DGLSL.glsl

@@ -0,0 +1,108 @@
+// Based on https://github.com/stegu/webgl-noise/blob/22434e04d7753f7e949e8d724ab3da2864c17a0f/src/noise3D.glsl
+// MIT licensed, adapted for p5.strands
+
+vec3 mod289(vec3 x) {
+  return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec4 mod289(vec4 x) {
+  return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec4 permute(vec4 x) {
+  return mod289(((x*34.0)+10.0)*x);
+}
+
+vec4 taylorInvSqrt(vec4 r)
+{
+  return 1.79284291400159 - 0.85373472095314 * r;
+}
+
+float baseNoise(vec3 v)
+{
+  const vec2  C = vec2(1.0/6.0, 1.0/3.0) ;
+  const vec4  D = vec4(0.0, 0.5, 1.0, 2.0);
+
+  // First corner
+  vec3 i  = floor(v + dot(v, C.yyy) );
+  vec3 x0 =   v - i + dot(i, C.xxx) ;
+
+  // Other corners
+  vec3 g = step(x0.yzx, x0.xyz);
+  vec3 l = 1.0 - g;
+  vec3 i1 = min( g.xyz, l.zxy );
+  vec3 i2 = max( g.xyz, l.zxy );
+
+  //   x0 = x0 - 0.0 + 0.0 * C.xxx;
+  //   x1 = x0 - i1  + 1.0 * C.xxx;
+  //   x2 = x0 - i2  + 2.0 * C.xxx;
+  //   x3 = x0 - 1.0 + 3.0 * C.xxx;
+  vec3 x1 = x0 - i1 + C.xxx;
+  vec3 x2 = x0 - i2 + C.yyy; // 2.0*C.x = 1/3 = C.y
+  vec3 x3 = x0 - D.yyy;      // -1.0+3.0*C.x = -0.5 = -D.y
+
+  // Permutations
+  i = mod289(i);
+  vec4 p = permute( permute( permute(
+          i.z + vec4(0.0, i1.z, i2.z, 1.0 ))
+        + i.y + vec4(0.0, i1.y, i2.y, 1.0 ))
+      + i.x + vec4(0.0, i1.x, i2.x, 1.0 ));
+
+  // Gradients: 7x7 points over a square, mapped onto an octahedron.
+  // The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)
+  float n_ = 0.142857142857; // 1.0/7.0
+  vec3  ns = n_ * D.wyz - D.xzx;
+
+  vec4 j = p - 49.0 * floor(p * ns.z * ns.z);  //  mod(p,7*7)
+
+  vec4 x_ = floor(j * ns.z);
+  vec4 y_ = floor(j - 7.0 * x_ );    // mod(j,N)
+
+  vec4 x = x_ *ns.x + ns.yyyy;
+  vec4 y = y_ *ns.x + ns.yyyy;
+  vec4 h = 1.0 - abs(x) - abs(y);
+
+  vec4 b0 = vec4( x.xy, y.xy );
+  vec4 b1 = vec4( x.zw, y.zw );
+
+  //vec4 s0 = vec4(lessThan(b0,0.0))*2.0 - 1.0;
+  //vec4 s1 = vec4(lessThan(b1,0.0))*2.0 - 1.0;
+  vec4 s0 = floor(b0)*2.0 + 1.0;
+  vec4 s1 = floor(b1)*2.0 + 1.0;
+  vec4 sh = -step(h, vec4(0.0));
+
+  vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ;
+  vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ;
+
+  vec3 p0 = vec3(a0.xy,h.x);
+  vec3 p1 = vec3(a0.zw,h.y);
+  vec3 p2 = vec3(a1.xy,h.z);
+  vec3 p3 = vec3(a1.zw,h.w);
+
+  //Normalise gradients
+  vec4 norm = taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));
+  p0 *= norm.x;
+  p1 *= norm.y;
+  p2 *= norm.z;
+  p3 *= norm.w;
+
+  // Mix final noise value
+  vec4 m = max(0.5 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.0);
+  m = m * m;
+  return 105.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1),
+        dot(p2,x2), dot(p3,x3) ) );
+}
+
+float noise(vec3 st) {
+  float result = 0.0;
+  float amplitude = 1.0;
+  float frequency = 1.0;
+
+  for (int i = 0; i < 4; i++) {
+    result += amplitude * baseNoise(st * frequency);
+    frequency *= 2.0;
+    amplitude *= 0.5;
+  }
+
+  return result;
+}

src/webgl/shaders/functions/noiseGLSL.glsl

@@ -84,6 +84,7 @@ suite('loadTable', function() {
     // TODO: Current parsing does not handle quoted fields
     const table = await mockP5Prototype.loadTable(validFile);
     assert.equal(table.getRowCount(), 4);
-    assert.equal(table.getRow(3).get(0), 'David,\nSr. "the boss"');
+    const value = table.getRow(3).get(0).replace(/\r\n/g, '\n');
+    assert.equal(value, 'David,\nSr. "the boss"');
   });
 });