From 8fe3d661595cf6d82f763e4c3c6e5f91ab5cb52e Mon Sep 17 00:00:00 2001
From: James Ball <james@ball.sh>
Date: Wed, 19 May 2021 22:27:18 +0100
Subject: [PATCH] Add distortion effects

---
 pom.xml                                       |  2 +-
 .../sh/ball/audio/effect/EffectFactory.java   | 12 ++++++++-
 .../java/sh/ball/audio/effect/EffectType.java |  4 ++-
 src/main/java/sh/ball/gui/Controller.java     | 26 ++++++++++++++++++-
 src/main/resources/fxml/osci-render.fxml      | 16 +++++++-----
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3628642d..c7631335 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>sh.ball</groupId>
     <artifactId>osci-render</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <name>osci-render</name>
 
diff --git a/src/main/java/sh/ball/audio/effect/EffectFactory.java b/src/main/java/sh/ball/audio/effect/EffectFactory.java
index 84d927e7..66d04893 100644
--- a/src/main/java/sh/ball/audio/effect/EffectFactory.java
+++ b/src/main/java/sh/ball/audio/effect/EffectFactory.java
@@ -24,7 +24,7 @@ public class EffectFactory {
     return (double) tmp / factor;
   }
 
-  public static Effect edgeStretch(double value) {
+  public static Effect horizontalDistort(double value) {
     return (count, v) -> {
       if (count % 2 == 0) {
         return v.translate(new Vector2(value, 0));
@@ -33,4 +33,14 @@ public class EffectFactory {
       }
     };
   }
+
+  public static Effect verticalDistort(double value) {
+    return (count, v) -> {
+      if (count % 2 == 0) {
+        return v.translate(new Vector2(0, value));
+      } else {
+        return v.translate(new Vector2(0, -value));
+      }
+    };
+  }
 }
diff --git a/src/main/java/sh/ball/audio/effect/EffectType.java b/src/main/java/sh/ball/audio/effect/EffectType.java
index 642d76fc..0dc4e3e1 100644
--- a/src/main/java/sh/ball/audio/effect/EffectType.java
+++ b/src/main/java/sh/ball/audio/effect/EffectType.java
@@ -5,5 +5,7 @@ public enum EffectType {
   BIT_CRUSH,
   SCALE,
   ROTATE,
-  TRANSLATE
+  TRANSLATE,
+  VERTICAL_DISTORT,
+  HORIZONTAL_DISTORT
 }
diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java
index 99a2e4be..13d353c9 100644
--- a/src/main/java/sh/ball/gui/Controller.java
+++ b/src/main/java/sh/ball/gui/Controller.java
@@ -108,6 +108,14 @@ public class Controller implements Initializable {
   private CheckBox bitCrushCheckBox;
   @FXML
   private Slider bitCrushSlider;
+  @FXML
+  private CheckBox verticalDistortCheckBox;
+  @FXML
+  private Slider verticalDistortSlider;
+  @FXML
+  private CheckBox horizontalDistortCheckBox;
+  @FXML
+  private Slider horizontalDistortSlider;
 
   public Controller(Renderer<List<Shape>, AudioInputStream> renderer) throws IOException {
     this.renderer = renderer;
@@ -141,7 +149,11 @@ public class Controller implements Initializable {
       EffectType.VECTOR_CANCELLING,
       vectorCancellingSlider,
       EffectType.BIT_CRUSH,
-      bitCrushSlider
+      bitCrushSlider,
+      EffectType.VERTICAL_DISTORT,
+      verticalDistortSlider,
+      EffectType.HORIZONTAL_DISTORT,
+      horizontalDistortSlider
     );
   }
 
@@ -175,6 +187,12 @@ public class Controller implements Initializable {
     InvalidationListener bitCrushListener = e ->
       updateEffect(EffectType.BIT_CRUSH, bitCrushCheckBox.isSelected(),
         EffectFactory.bitCrush(bitCrushSlider.getValue()));
+    InvalidationListener verticalDistortListener = e ->
+      updateEffect(EffectType.VERTICAL_DISTORT, verticalDistortCheckBox.isSelected(),
+        EffectFactory.verticalDistort(verticalDistortSlider.getValue()));
+    InvalidationListener horizontalDistortListener = e ->
+      updateEffect(EffectType.HORIZONTAL_DISTORT, horizontalDistortCheckBox.isSelected(),
+        EffectFactory.horizontalDistort(horizontalDistortSlider.getValue()));
 
     vectorCancellingSlider.valueProperty().addListener(vectorCancellingListener);
     vectorCancellingCheckBox.selectedProperty().addListener(vectorCancellingListener);
@@ -182,6 +200,12 @@ public class Controller implements Initializable {
     bitCrushSlider.valueProperty().addListener(bitCrushListener);
     bitCrushCheckBox.selectedProperty().addListener(bitCrushListener);
 
+    verticalDistortSlider.valueProperty().addListener(verticalDistortListener);
+    verticalDistortCheckBox.selectedProperty().addListener(verticalDistortListener);
+
+    horizontalDistortSlider.valueProperty().addListener(horizontalDistortListener);
+    horizontalDistortCheckBox.selectedProperty().addListener(horizontalDistortListener);
+
     fileChooser.setInitialFileName("out.wav");
     fileChooser.getExtensionFilters().addAll(
       new FileChooser.ExtensionFilter("All Files", "*.*"),
diff --git a/src/main/resources/fxml/osci-render.fxml b/src/main/resources/fxml/osci-render.fxml
index b71e2a67..844b10ce 100644
--- a/src/main/resources/fxml/osci-render.fxml
+++ b/src/main/resources/fxml/osci-render.fxml
@@ -12,17 +12,17 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane alignment="center" hgap="10" prefHeight="790.0" prefWidth="400.0" vgap="10" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
+<GridPane alignment="center" hgap="10" prefHeight="844.0" prefWidth="400.0" vgap="10" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints />
   </columnConstraints>
   <rowConstraints>
     <RowConstraints />
   </rowConstraints>
-  <AnchorPane prefHeight="810.0" prefWidth="400.0">
+  <AnchorPane prefHeight="874.0" prefWidth="400.0">
     <Button fx:id="chooseFileButton" layoutX="8.0" layoutY="24.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Choose File" />
-    <SplitPane dividerPositions="0.31499312242090777, 0.6158872077028884" layoutX="6.0" layoutY="118.0" orientation="VERTICAL" prefHeight="666.0" prefWidth="388.0">
-      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="178.0" prefWidth="396.0">
+    <SplitPane dividerPositions="0.2943143812709029, 0.6148272017837234" layoutX="6.0" layoutY="107.0" orientation="VERTICAL" prefHeight="730.0" prefWidth="388.0">
+      <AnchorPane minHeight="0.0" minWidth="0.0">
         <Slider fx:id="rotateSpeedSlider" blockIncrement="0.05" layoutX="116.0" layoutY="90.0" majorTickUnit="1.0" max="10.0" prefHeight="38.0" prefWidth="247.0" showTickLabels="true" showTickMarks="true" />
         <Label layoutX="37.0" layoutY="88.0" text="Rotate speed" />
         <Slider fx:id="translationSpeedSlider" blockIncrement="0.05" layoutX="116.0" layoutY="128.0" majorTickUnit="1.0" max="10.0" prefHeight="38.0" prefWidth="247.0" showTickLabels="true" showTickMarks="true" />
@@ -37,14 +37,18 @@
         <TextField fx:id="translationYTextField" layoutX="234.0" layoutY="13.0" prefHeight="26.0" prefWidth="70.0" text="0" />
             <Slider fx:id="weightSlider" blockIncrement="1.0" layoutX="116.0" layoutY="52.0" majorTickUnit="100.0" max="1000.0" prefHeight="38.0" prefWidth="247.0" showTickLabels="true" showTickMarks="true" value="100.0" />
       </AnchorPane>
-         <TitledPane animated="false" collapsible="false" prefHeight="169.0" prefWidth="385.0" text="Effects" SplitPane.resizableWithParent="false">
+         <TitledPane animated="false" collapsible="false" text="Effects" SplitPane.resizableWithParent="false">
            <content>
-             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="66.0" prefWidth="383.0">
+             <AnchorPane minHeight="0.0" minWidth="0.0">
                   <children>
                      <CheckBox fx:id="vectorCancellingCheckBox" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" text="Vector cancelling" />
                      <Slider fx:id="vectorCancellingSlider" blockIncrement="0.05" disable="true" layoutX="141.0" layoutY="16.0" majorTickUnit="1.0" max="10.0" min="2.0" prefHeight="38.0" prefWidth="222.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="2.0" />
                      <CheckBox fx:id="bitCrushCheckBox" layoutX="14.0" layoutY="52.0" mnemonicParsing="false" text="Bit crush" />
                      <Slider fx:id="bitCrushSlider" blockIncrement="0.01" disable="true" layoutX="141.0" layoutY="55.0" majorTickUnit="0.5" max="3.0" prefHeight="38.0" prefWidth="222.0" showTickLabels="true" showTickMarks="true" value="2.0" />
+                     <CheckBox fx:id="verticalDistortCheckBox" layoutX="14.0" layoutY="93.0" mnemonicParsing="false" text="Vertical Distort" />
+                     <Slider fx:id="verticalDistortSlider" blockIncrement="0.005" disable="true" layoutX="141.0" layoutY="96.0" majorTickUnit="0.1" max="1.0" prefHeight="38.0" prefWidth="222.0" showTickLabels="true" showTickMarks="true" value="0.2" />
+                     <CheckBox fx:id="horizontalDistortCheckBox" layoutX="14.0" layoutY="136.0" mnemonicParsing="false" text="Horizontal Distort" />
+                     <Slider fx:id="horizontalDistortSlider" blockIncrement="0.005" disable="true" layoutX="141.0" layoutY="139.0" majorTickUnit="0.1" max="1.0" prefHeight="38.0" prefWidth="222.0" showTickLabels="true" showTickMarks="true" value="0.2" />
                   </children>
                </AnchorPane>
            </content>