Merge pull request #20 from martinRenou/refactor

Refactor the Water effect

Author: martinRenou

src/Effects/Alpha.ts

@@ -35,7 +35,12 @@ class Alpha extends Effect {
 
     this.sortTriangleIndices();
 
-    this.parent.on('change:geometry', this.sortTriangleIndices.bind(this));
+    // There is no new geometry specific to this effect, we forward the parent event
+    this.parent.on('change:geometry', () => {
+      this.sortTriangleIndices.bind(this);
+
+      this.trigger('change:geometry');
+    });
 
     this.initialized = true;
     this.updateMatrix();

src/Effects/IsoColor.ts

@@ -45,6 +45,10 @@ class IsoColor extends Effect {
     this.buildMaterial();
 
     this.initialized = true;
+
+    // There is no new geometry specific to this effect, we forward the parent event
+    this.parent.on('change:geometry', () => { this.trigger('change:geometry'); });
+
     this.updateMatrix();
   }
 

src/Effects/RGB.ts

@@ -34,6 +34,10 @@ class RGB extends Effect {
     this.buildMaterial();
 
     this.initialized = true;
+
+    // There is no new geometry specific to this effect, we forward the parent event
+    this.parent.on('change:geometry', () => { this.trigger('change:geometry'); });
+
     this.updateMatrix();
   }
 

src/Effects/Threshold.ts

@@ -55,6 +55,7 @@ class Threshold extends Effect {
     // Returns 1 if input > min, 0 otherwise
     this.isOverMin = new Nodes.MathNode(this.minNode, this.inputNode, Nodes.MathNode.STEP);
 
+    // TODO: Use a mask node instead of an alpha node?
     this.thresholdAlpha = new Nodes.OperatorNode(this.isUnderMax, this.isOverMin, Nodes.OperatorNode.MUL);
 
     this.addAlphaNode(NodeOperation.MUL, this.thresholdAlpha);
@@ -83,10 +84,14 @@ class Threshold extends Effect {
       this.meshes.push(this.mesh2);
 
       this.inputComponent.on('change:array', this.onInputArrayChange.bind(this));
+    } else {
+      // There is no new geometry specific to this effect, we forward the parent event
+      this.parent.on('change:geometry', () => { this.trigger('change:geometry'); });
     }
 
     this.buildMaterial();
 
+
     this.initialized = true;
   }
 

src/Effects/Warp.ts

@@ -38,6 +38,10 @@ class Warp extends Effect {
     this.buildMaterial();
 
     this.initialized = true;
+
+    // There is no new geometry specific to this effect, we forward the parent event
+    this.parent.on('change:geometry', () => { this.trigger('change:geometry'); });
+
     this.updateMatrix();
   }
 

src/Plugins/Water/UnderWater.ts src/Effects/Water/UnderWater.tssrc/Plugins/Water/UnderWater.ts renamed to src/Effects/Water/UnderWater.ts

@@ -145,9 +145,9 @@ float noise(vec2 st) {
             dot(random2(i + vec2(1.0, 0.0)), f - vec2(1.0, 0.0)),
             u.x
         ),
-    mix(
+        mix(
             dot(random2(i + vec2(0.0, 1.0)), f - vec2(0.0, 1.0)),
-      dot(random2(i + vec2(1.0, 1.0) ), f - vec2(1.0, 1.0)),
+            dot(random2(i + vec2(1.0, 1.0) ), f - vec2(1.0, 1.0)),
             u.x
         ),
         u.y