fix(operator): correct handling for 4th channel

basics · Jul 9, 2020 · 13685c9 · 13685c9
1 parent ee2622e
commit 13685c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/operator.js b/src/operator.js
@@ -2,6 +2,7 @@
 const X = 0;
 const Y = 1;
 const Z = 2;
+const W = 3;
 const DEFAULT = undefined;
 const VECTOR_LENGTH = Symbol('vector length');
 const GET_SOURCE = Symbol('get source');
@@ -37,7 +38,7 @@ function getVectorLength(vec) {
   if (getSource) {
     return getSource(vec).length;
   }
-  return vec[VECTOR_LENGTH] !== 2 ? 3 : 2;
+  return vec[VECTOR_LENGTH] || 3;
 }
 
 function getVectorValue(vec, index) {
@@ -57,6 +58,9 @@ function getVectorValue(vec, index) {
   if (index === Z) {
     return vec.z;
   }
+  if (index === W) {
+    return vec.w;
+  }
   // really?
   return undefined;
 }
@@ -78,6 +82,9 @@ function setVectorValue(vec, index, value) {
   if (index === Z) {
     vec.z = value;
   }
+  if (index === W) {
+    vec.w = value;
+  }
 }
 
 function maxVector(v1, v2) {
@@ -185,6 +192,10 @@ function bindCache(org) {
       resultCacheIndex += 1;
       return resultCache[resultCacheIndex];
     }
+    if (inProgress === W) {
+      resultCacheIndex += 1;
+      return resultCache[resultCacheIndex];
+    }
     return org.apply(this, args);
   };
 }

diff --git a/test/color.js b/test/color.js
@@ -30,13 +30,13 @@ const colorTest = (color, Color) => {
 
   it('should be calculated by assigned statement', () => {
     const pos = color(5, 6, 7, 8);
-    const dir = color(1, 0, 1, 0);
+    const dir = color(1, 0, 1, 1);
     const scale = color(() => dir * pos);
 
     assert.equal(scale.x, 5);
     assert.equal(scale.y, 0);
     assert.equal(scale.z, 7);
-    assert.equal(scale.w, 0);
+    assert.equal(scale.w, 8);
   });
 
   it('should be calculated by assigned statement with only numbers', () => {