Merge branch 'sritchie/pr_fixes' into 'master'

Apply fixes from backlogged PRs

See merge request unconed/mathbox!16

CHANGES.md

@@ -1,5 +1,19 @@
 ### MathBox Changelog
 
+2.1.1
+
+!16 applies JS-ported patches from the following open merge requests:
+
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/11/
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/10
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/9
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/8
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/7
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/6
+  - https://gitgud.io/unconed/mathbox/-/merge_requests/5
+
+  Thanks to @bobqwatsonsapphire, @carl00s01 and @Beddington for these fixes.
+
 0.0.5
 
 - ⚠️ Rename array `length` to `width` for consistency.

docs/primitives.md

@@ -347,7 +347,7 @@
  * *points* = `<` (select) - Points data source
  * *proximity* = `null` (nullable number) - Proximity threshold, e.g. `10`
  * *shaded* = `false` (bool) - Shade mesh
- * *size* = `2` (positive number) - Line width
+ * *width* = `2` (positive number) - Line width
  * *stroke* = `"solid"` (stroke) - Line stroke (solid, dotted, dashed)
  * *visible* = `true` (bool) - Visibility for rendering
  * *zBias* = `0` (positive number) - Z-Bias (3D stacking)
@@ -424,7 +424,7 @@
  * *proximity* = `null` (nullable number) - Proximity threshold, e.g. `10`
  * *rangeX* = `[-1, 1]` (vec2) - Range on axis
  * *rangeY* = `[-1, 1]` (vec2) - Range on axis
- * *size* = `2` (positive number) - Line width
+ * *width* = `2` (positive number) - Line width
  * *startX* = `true` (bool) - Include start
  * *startY* = `true` (bool) - Include start
  * *stroke* = `"solid"` (stroke) - Line stroke (solid, dotted, dashed)
@@ -1322,4 +1322,3 @@
  * *realtime* = `false` (bool) - Run on real time, not clock time
  * *type* = `"float"` (type) - Texture data type
  * *width* = `1` (nullable number) - Voxel width
-

src/overlay/dom.js

@@ -56,6 +56,11 @@ export class DOM extends Overlay {
       el = this.el("div", null, el);
     }
 
+    // Create empty div if el is null
+    if (el == null) {
+      el = this.el("div");
+    }
+
     // See if it can be mounted directly
     const naked = el.type === "div";
 

src/primitives/types/operator/lerp.js

@@ -195,12 +195,13 @@ export class Lerp extends Operator {
       vec[i] = centered ? "0.5" : "0.0";
     }
 
+    let vec4;
+
     // Add centered sampling offset (from source)
     if (any && resize) {
-      vec = `vec4(${vec})`;
-      // TODO is this right? it was vec4 before.
-      operator.pipe(UGLSL.binaryOperator(4, "+", vec));
-      indexer.pipe(UGLSL.binaryOperator(4, "+", vec));
+      vec4 = `vec4(${vec})`;
+      operator.pipe(UGLSL.binaryOperator(4, "+", vec4));
+      indexer.pipe(UGLSL.binaryOperator(4, "+", vec4));
     }
 
     // Addressing relative to target
@@ -214,8 +215,8 @@ export class Lerp extends Operator {
 
     // Remove centered sampling offset (to target)
     if (any && resize) {
-      operator.pipe(UGLSL.binaryOperator(4, "-", vec));
-      indexer.pipe(UGLSL.binaryOperator(4, "-", vec));
+      operator.pipe(UGLSL.binaryOperator(4, "-", vec4));
+      indexer.pipe(UGLSL.binaryOperator(4, "-", vec4));
     }
 
     // Make sampler

src/primitives/types/overlay/dom.js

@@ -126,7 +126,7 @@ export class DOM extends Primitive {
     if (this.readback == null) {
       return;
     }
-    this.dom.render(this.isVisible ? this.emitter.nodes() : []);
+    this.dom.render(this.isVisible ? this.emitter.nodes() : null);
   }
 
   callback(data) {

src/render/buffer/readback.js

@@ -263,7 +263,7 @@ export class Readback extends Renderable {
 
   post() {
     const currentTarget = this.renderer.getRenderTarget();
-    this.renderer.setRenderTarget(this.byteMemo.target.write);
+    this.renderer.setRenderTarget(this.byteMemo.target.targets[0]);
     this.gl.readPixels(
       0,
       0,

src/shaders/glsl/line.position.glsl

@@ -8,7 +8,7 @@ uniform float focusDepth;
 uniform vec4 geometryClip;
 attribute vec4 position4;
 
-// (Start/mid/end -1/0/1, top/bottom -1,1) 
+// (Start/mid/end -1/0/1, top/bottom -1,1)
 attribute vec2 line;
 
 // 0...1 for round or bevel joins
@@ -72,20 +72,25 @@ void clipEnds(vec4 xyzw, vec3 center, vec3 pos) {
       float z = max(0.00001, -end.z);
       depth = mix(z, focusDepth, lineDepth);
     }
-    
+
     // Absolute arrow length
     float size = arrowSize * depth;
 
     // Adjust clip range
     // Approach linear scaling with cubic ease the smaller we get
     float mini = clamp(1.0 - l / size * .333, 0.0, 1.0);
-    float scale = 1.0 - mini * mini * mini; 
+    float scale = 1.0 - mini * mini * mini;
     float invrange = 1.0 / (size * scale);
-  
+
     // Clip end
-    diff = normalize(end - center);
-    float d = dot(end - pos, diff);
-    vClipEnds.x = d * invrange - 1.0;
+    diff = end - center;
+    if(diff == vec3(0.0))
+      vClipEnds.x = -1.0;
+    else {
+      diff = normalize(end - center);
+      float d = dot(end - pos, diff);
+      vClipEnds.x = d * invrange - 1.0;
+    }
   }
 
   if (clipStyle.x > 0.0) {
@@ -95,20 +100,25 @@ void clipEnds(vec4 xyzw, vec3 center, vec3 pos) {
       float z = max(0.00001, -start.z);
       depth = mix(z, focusDepth, lineDepth);
     }
-    
+
     // Absolute arrow length
     float size = arrowSize * depth;
 
     // Adjust clip range
     // Approach linear scaling with cubic ease the smaller we get
     float mini = clamp(1.0 - l / size * .333, 0.0, 1.0);
-    float scale = 1.0 - mini * mini * mini; 
+    float scale = 1.0 - mini * mini * mini;
     float invrange = 1.0 / (size * scale);
-
-    // Clip start 
-    diff = normalize(center - start);
-    float d = dot(pos - start, diff);
-    vClipEnds.y = d * invrange - 1.0;
+
+    // Clip start
+    diff = center - start;
+    if(diff == vec3(0.0))
+      vClipEnds.y = -1.0;
+    else {
+      diff = normalize(center - start);
+      float d = dot(pos - start, diff);
+      vClipEnds.y = d * invrange - 1.0;
+    }
   }
 
 
@@ -171,7 +181,7 @@ vec3 getLineJoin(float edge, bool odd, vec3 left, vec3 center, vec3 right, float
   float l2 = dot(d.zw, d.zw);
 
   if (l1 + l2 > 0.0) {
-    
+
     if (edge > 0.5 || l2 == 0.0) {
       vec2 nl = normalize(d.xy);
       vec2 tl = vec2(nl.y, -nl.x);
@@ -226,7 +236,7 @@ vec3 getLineJoin(float edge, bool odd, vec3 left, vec3 center, vec3 right, float
       // Average tangent
       vec2 tc = normalize(tl + tr);
 #endif
-    
+
       // Miter join
       float cosA   = dot(nl, tc);
       float sinA   = max(0.1, abs(dot(tl, tc)));

src/stage/animator.js

@@ -62,6 +62,8 @@ export class Animator {
         const emitter = type.emitter(from, to);
         from.emitterFrom = emitter;
         to.emitterTo = emitter;
+        emitter.lerp(f);
+        return emitter;
       }
 
       // Generic binary operator

src/stage/api.js

@@ -185,7 +185,7 @@ export class API {
 
   off() {
     const args = arguments;
-    this._targets.map((x) => x.on.apply(x, args));
+    this._targets.map((x) => x.off.apply(x, args));
     return this;
   }