Fix line endings, add ObjController, move save/load logic to sub-controllers

src/main/java/sh/ball/gui/controller/EffectsController.java

@@ -10,6 +10,8 @@ import javafx.scene.control.CheckBox;
 import javafx.scene.control.Slider;
 import javafx.scene.shape.SVGPath;
 import javafx.util.Duration;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import sh.ball.audio.FrequencyAnalyser;
 import sh.ball.audio.ShapeAudioPlayer;
 import sh.ball.audio.effect.*;
@@ -17,10 +19,7 @@ import sh.ball.audio.engine.AudioDevice;
 import sh.ball.shapes.Shape;
 
 import java.net.URL;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
 
 public class EffectsController implements Initializable {
 
@@ -203,12 +202,40 @@ public class EffectsController implements Initializable {
     traceCheckBox.selectedProperty().addListener(traceListener);
   }
 
-  public List<CheckBox> effectCheckBoxes() {
+  public List<CheckBox> checkBoxes() {
     return List.of(vectorCancellingCheckBox, bitCrushCheckBox, verticalDistortCheckBox,
       horizontalDistortCheckBox, wobbleCheckBox, smoothCheckBox, traceCheckBox);
   }
-  public List<Slider> effectSliders() {
+  public List<Slider> sliders() {
     return List.of(vectorCancellingSlider, bitCrushSlider, verticalDistortSlider,
       horizontalDistortSlider, wobbleSlider, smoothSlider, traceSlider);
   }
+  public List<String> labels() {
+    return List.of("vectorCancelling", "bitCrush", "verticalDistort", "horizontalDistort",
+      "wobble", "smooth", "trace");
+  }
+
+  public Element save(Document document) {
+    Element element = document.createElement("checkBoxes");
+    List<CheckBox> checkBoxes = checkBoxes();
+    List<String> labels = labels();
+    for (int i = 0; i < checkBoxes.size(); i++) {
+      Element checkBox = document.createElement(labels.get(i));
+      checkBox.appendChild(
+        document.createTextNode(checkBoxes.get(i).selectedProperty().getValue().toString())
+      );
+      element.appendChild(checkBox);
+    }
+    return element;
+  }
+
+  public void load(Element root) {
+    Element element = (Element) root.getElementsByTagName("checkBoxes").item(0);
+    List<CheckBox> checkBoxes = checkBoxes();
+    List<String> labels = labels();
+    for (int i = 0; i < checkBoxes.size(); i++) {
+      String value = element.getElementsByTagName(labels.get(i)).item(0).getTextContent();
+      checkBoxes.get(i).setSelected(Boolean.parseBoolean(value));
+    }
+  }
 }

src/main/java/sh/ball/gui/controller/MainController.java

@@ -6,7 +6,6 @@ import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.collections.FXCollections;
 import javafx.scene.control.*;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.SVGPath;
@@ -26,7 +25,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 
-import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.stage.FileChooser;
@@ -47,7 +45,6 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.xml.sax.SAXException;
-import sh.ball.audio.effect.Effect;
 import sh.ball.audio.effect.EffectType;
 import sh.ball.audio.engine.AudioDevice;
 import sh.ball.audio.engine.ConglomerateAudioEngine;
@@ -94,7 +91,6 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
   private List<FrameSource<List<Shape>>> frameSources = new ArrayList<>();
   private FrameProducer<List<Shape>> producer;
   private int currentFrameSource;
-  private Vector3 rotation = new Vector3();
 
   // frame playback (code by DJ_Level_3)
   private static final int MAX_FRAME_RATE = 120;
@@ -112,6 +108,8 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
   @FXML
   private EffectsController effectsController;
   @FXML
+  private ObjController objController;
+  @FXML
   private Label frequencyLabel;
   @FXML
   private Button chooseFileButton;
@@ -154,16 +152,6 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
   @FXML
   private TitledPane objTitledPane;
   @FXML
-  private Slider focalLengthSlider;
-  @FXML
-  private SVGPath focalLengthMidi;
-  @FXML
-  private Slider objectRotateSpeedSlider;
-  @FXML
-  private SVGPath objectRotateSpeedMidi;
-  @FXML
-  private CheckBox rotateCheckBox;
-  @FXML
   private Slider octaveSlider;
   @FXML
   private SVGPath octaveMidi;
@@ -217,10 +205,9 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     midiMap.put(rotateSpeedMidi, rotateSpeedSlider);
     midiMap.put(translationSpeedMidi, translationSpeedSlider);
     midiMap.put(volumeMidi, volumeSlider);
-    midiMap.put(focalLengthMidi, focalLengthSlider);
-    midiMap.put(objectRotateSpeedMidi, objectRotateSpeedSlider);
     midiMap.put(octaveMidi, octaveSlider);
     midiMap.put(visibilityMidi, visibilitySlider);
+    midiMap.putAll(objController.getMidiButtonMap());
     midiMap.putAll(effectsController.getMidiButtonMap());
     return midiMap;
   }
@@ -231,8 +218,6 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     return Map.of(
       rotateSpeedSlider, rotateEffect::setSpeed,
       translationSpeedSlider, translateEffect::setSpeed,
-      focalLengthSlider, this::updateFocalLength,
-      objectRotateSpeedSlider, this::updateObjectRotateSpeed,
       visibilitySlider, audioPlayer::setMainFrequencyScale
     );
   }
@@ -249,6 +234,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     audioPlayer.setVolume(volumeSlider.valueProperty());
 
     effectsController.setAudioPlayer(audioPlayer);
+    objController.setAudioProducer(producer);
 
     this.midiButtonMap = initializeMidiButtonMap();
 
@@ -350,7 +336,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       recordTextField.setDisable(!newVal);
     });
 
-    updateObjectRotateSpeed(rotateSpeedSlider.getValue());
+    objController.updateObjectRotateSpeed();
 
     audioPlayer.addEffect(EffectType.ROTATE, rotateEffect);
     audioPlayer.addEffect(EffectType.TRANSLATE, translateEffect);
@@ -488,18 +474,6 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     }
   }
 
-  // changes the focalLength of the FrameProducer
-  private void updateFocalLength(double focalLength) {
-    producer.setFrameSettings(ObjSettingsFactory.focalLength(focalLength));
-  }
-
-  // changes the rotateSpeed of the FrameProducer
-  private void updateObjectRotateSpeed(double rotateSpeed) {
-    producer.setFrameSettings(
-      ObjSettingsFactory.rotateSpeed((Math.exp(3 * rotateSpeed) - 1) / 50)
-    );
-  }
-
   // changes the sinusoidal translation of the image rendered
   private void updateTranslation() {
     translateEffect.setTranslation(new Vector2(
@@ -520,10 +494,11 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
 
     Object oldSettings = producer.getFrameSettings();
     producer = new FrameProducer<>(audioPlayer, frames);
+    objController.setAudioProducer(producer);
 
     // Apply the same settings that the previous frameSource had
-    updateObjectRotateSpeed(objectRotateSpeedSlider.getValue());
+    objController.updateObjectRotateSpeed();
-    updateFocalLength(focalLengthSlider.getValue());
+    objController.updateFocalLength();
     if (oldSettings instanceof ObjFrameSettings settings) {
       setObjRotate(settings.baseRotation, settings.currentRotation);
     }
@@ -701,24 +676,23 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
 
   // determines whether the mouse is being used to rotate a 3D object
   public boolean mouseRotate() {
-    return rotateCheckBox.isSelected();
+    return objController.mouseRotate();
   }
 
   // stops the mouse rotating the 3D object when ESC is pressed or checkbox is
   // unchecked
   public void disableMouseRotate() {
-    rotateCheckBox.setSelected(false);
+    objController.disableMouseRotate();
   }
 
   // updates the 3D object base rotation angle
   public void setObjRotate(Vector3 vector) {
-    rotation = vector;
+    objController.setObjRotate(vector);
-    producer.setFrameSettings(ObjSettingsFactory.baseRotation(vector));
   }
 
   // updates the 3D object base and current rotation angle
   protected void setObjRotate(Vector3 baseRotation, Vector3 currentRotation) {
-    producer.setFrameSettings(ObjSettingsFactory.rotation(baseRotation, currentRotation));
+    objController.setObjRotate(baseRotation, currentRotation);
   }
 
   @Override
@@ -787,25 +761,25 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
   }
 
   // must be functions, otherwise they are not initialised
-  private List<String> checkBoxLabels() {
-    return List.of("vectorCancelling", "bitCrush", "verticalDistort", "horizontalDistort",
-      "wobble", "smooth", "trace");
-  }
   private List<Slider> otherSliders() {
-    return List.of(octaveSlider, frequencySlider, rotateSpeedSlider, translationSpeedSlider,
+    List<Slider> sliders = new ArrayList<>(List.of(octaveSlider, frequencySlider, rotateSpeedSlider, translationSpeedSlider,
-      volumeSlider, visibilitySlider, focalLengthSlider, objectRotateSpeedSlider);
+      volumeSlider, visibilitySlider));
+    sliders.addAll(objController.sliders());
+    return sliders;
   }
   private List<String> otherLabels() {
-    return List.of("octave", "frequency", "rotateSpeed", "translationSpeed", "volume",
+    List<String> labels = new ArrayList<>(List.of("octave", "frequency", "rotateSpeed", "translationSpeed", "volume",
-      "visibility", "focalLength", "objectRotateSpeed");
+      "visibility"));
+    labels.addAll(objController.labels());
+    return labels;
   }
   private List<Slider> allSliders() {
-    List<Slider> sliders = new ArrayList<>(effectsController.effectSliders());
+    List<Slider> sliders = new ArrayList<>(effectsController.sliders());
     sliders.addAll(otherSliders());
     return sliders;
   }
   private List<String> allLabels() {
-    List<String> labels = new ArrayList<>(checkBoxLabels());
+    List<String> labels = new ArrayList<>(effectsController.labels());
     labels.addAll(otherLabels());
     return labels;
   }
@@ -836,29 +810,14 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       Element root = document.createElement("project");
       document.appendChild(root);
 
-      // Is there a nicer way of doing this?!
-      List<CheckBox> checkBoxes = effectsController.effectCheckBoxes();
-      List<Slider> checkBoxSliders = effectsController.effectSliders();
-      List<String> checkBoxLabels = checkBoxLabels();
-      List<Slider> otherSliders = otherSliders();
-      List<String> otherLabels = otherLabels();
       List<Slider> sliders = allSliders();
       List<String> labels = allLabels();
 
       Element slidersElement = document.createElement("sliders");
-      appendSliders(checkBoxSliders, checkBoxLabels, slidersElement, document);
+      appendSliders(sliders, labels, slidersElement, document);
-      appendSliders(otherSliders, otherLabels, slidersElement, document);
       root.appendChild(slidersElement);
 
-      Element checkBoxesElement = document.createElement("checkBoxes");
+      root.appendChild(effectsController.save(document));
-      for (int i = 0; i < checkBoxes.size(); i++) {
-        Element checkBox = document.createElement(checkBoxLabels.get(i));
-        checkBox.appendChild(
-          document.createTextNode(checkBoxes.get(i).selectedProperty().getValue().toString())
-        );
-        checkBoxesElement.appendChild(checkBox);
-      }
-      root.appendChild(checkBoxesElement);
 
       Element midiElement = document.createElement("midi");
       for (Map.Entry<Integer, SVGPath> entry : CCMap.entrySet()) {
@@ -880,17 +839,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       translationElement.appendChild(translationYElement);
       root.appendChild(translationElement);
 
-      Element objectRotationElement = document.createElement("objectRotation");
+      root.appendChild(objController.save(document));
-      Element objectRotationXElement = document.createElement("x");
-      objectRotationXElement.appendChild(document.createTextNode(Double.toString(rotation.getX())));
-      Element objectRotationYElement = document.createElement("y");
-      objectRotationYElement.appendChild(document.createTextNode(Double.toString(rotation.getY())));
-      Element objectRotationZElement = document.createElement("z");
-      objectRotationZElement.appendChild(document.createTextNode(Double.toString(rotation.getZ())));
-      objectRotationElement.appendChild(objectRotationXElement);
-      objectRotationElement.appendChild(objectRotationYElement);
-      objectRotationElement.appendChild(objectRotationZElement);
-      root.appendChild(objectRotationElement);
 
       Element filesElement = document.createElement("files");
       for (int i = 0; i < openFiles.size(); i++) {
@@ -934,11 +883,6 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       Document document = documentBuilder.parse(new File(projectFileName));
       document.getDocumentElement().normalize();
 
-      List<CheckBox> checkBoxes = effectsController.effectCheckBoxes();
-      List<Slider> checkBoxSliders = effectsController.effectSliders();
-      List<String> checkBoxLabels = checkBoxLabels();
-      List<Slider> otherSliders = otherSliders();
-      List<String> otherLabels = otherLabels();
       List<Slider> sliders = allSliders();
       List<String> labels = allLabels();
 
@@ -947,14 +891,9 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
 
       Element root = document.getDocumentElement();
       Element slidersElement = (Element) root.getElementsByTagName("sliders").item(0);
-      loadSliderValues(checkBoxSliders, checkBoxLabels, slidersElement);
+      loadSliderValues(sliders, labels, slidersElement);
-      loadSliderValues(otherSliders, otherLabels, slidersElement);
 
-      Element checkBoxesElement = (Element) root.getElementsByTagName("checkBoxes").item(0);
+      effectsController.load(root);
-      for (int i = 0; i < checkBoxes.size(); i++) {
-        String value = checkBoxesElement.getElementsByTagName(checkBoxLabels.get(i)).item(0).getTextContent();
-        checkBoxes.get(i).setSelected(Boolean.parseBoolean(value));
-      }
 
       Element midiElement = (Element) root.getElementsByTagName("midi").item(0);
       resetCCMap();
@@ -978,16 +917,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       translationXTextField.setText(translationXElement.getTextContent());
       translationYTextField.setText(translationYElement.getTextContent());
 
-      Element objectRotationElement = (Element) root.getElementsByTagName("objectRotation").item(0);
+      objController.load(root);
-      Element objectRotationXElement = (Element) objectRotationElement.getElementsByTagName("x").item(0);
-      Element objectRotationYElement = (Element) objectRotationElement.getElementsByTagName("y").item(0);
-      Element objectRotationZElement = (Element) objectRotationElement.getElementsByTagName("z").item(0);
-      rotation = new Vector3(
-        Double.parseDouble(objectRotationXElement.getTextContent()),
-        Double.parseDouble(objectRotationYElement.getTextContent()),
-        Double.parseDouble(objectRotationZElement.getTextContent())
-      );
-      setObjRotate(rotation);
 
       Element filesElement = (Element) root.getElementsByTagName("files").item(0);
       List<byte[]> files = new ArrayList<>();

src/main/java/sh/ball/gui/controller/ObjController.java

@@ -0,0 +1,131 @@
+package sh.ball.gui.controller;
+
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Slider;
+import javafx.scene.shape.SVGPath;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import sh.ball.audio.FrameProducer;
+import sh.ball.engine.Vector3;
+import sh.ball.parser.obj.ObjSettingsFactory;
+import sh.ball.shapes.Shape;
+
+import java.net.URL;
+import java.util.*;
+
+public class ObjController implements Initializable {
+
+  private Vector3 rotation = new Vector3(2 * Math.PI, 2 * Math.PI, 0);
+  private FrameProducer<List<Shape>> producer;
+
+  @FXML
+  private Slider focalLengthSlider;
+  @FXML
+  private SVGPath focalLengthMidi;
+  @FXML
+  private Slider objectRotateSpeedSlider;
+  @FXML
+  private SVGPath objectRotateSpeedMidi;
+  @FXML
+  private CheckBox rotateCheckBox;
+
+  public Map<SVGPath, Slider> getMidiButtonMap() {
+    Map<SVGPath, Slider> midiMap = new HashMap<>();
+    midiMap.put(focalLengthMidi, focalLengthSlider);
+    midiMap.put(objectRotateSpeedMidi, objectRotateSpeedSlider);
+    return midiMap;
+  }
+
+  public void updateFocalLength() {
+    setFocalLength(focalLengthSlider.getValue());
+  }
+
+  public void setAudioProducer(FrameProducer<List<Shape>> producer) {
+    this.producer = producer;
+  }
+
+  // changes the focalLength of the FrameProducer
+  public void setFocalLength(double focalLength) {
+    producer.setFrameSettings(ObjSettingsFactory.focalLength(focalLength));
+  }
+
+  public void updateObjectRotateSpeed() {
+    setObjectRotateSpeed(objectRotateSpeedSlider.getValue());
+  }
+
+  // changes the rotateSpeed of the FrameProducer
+  public void setObjectRotateSpeed(double rotateSpeed) {
+    producer.setFrameSettings(
+      ObjSettingsFactory.rotateSpeed((Math.exp(3 * rotateSpeed) - 1) / 50)
+    );
+  }
+
+  // determines whether the mouse is being used to rotate a 3D object
+  public boolean mouseRotate() {
+    return rotateCheckBox.isSelected();
+  }
+
+  // stops the mouse rotating the 3D object when ESC is pressed or checkbox is
+  // unchecked
+  public void disableMouseRotate() {
+    rotateCheckBox.setSelected(false);
+  }
+
+  // updates the 3D object base rotation angle
+  public void setObjRotate(Vector3 vector) {
+    rotation = vector;
+    producer.setFrameSettings(ObjSettingsFactory.baseRotation(vector));
+  }
+
+  // updates the 3D object base and current rotation angle
+  public void setObjRotate(Vector3 baseRotation, Vector3 currentRotation) {
+    producer.setFrameSettings(ObjSettingsFactory.rotation(baseRotation, currentRotation));
+  }
+
+  @Override
+  public void initialize(URL url, ResourceBundle resourceBundle) {
+    focalLengthSlider.valueProperty().addListener((source, oldValue, newValue) ->
+      setFocalLength(newValue.doubleValue())
+    );
+    objectRotateSpeedSlider.valueProperty().addListener((source, oldValue, newValue) ->
+      setObjectRotateSpeed(newValue.doubleValue())
+    );
+  }
+
+  public List<Slider> sliders() {
+    return List.of(focalLengthSlider, objectRotateSpeedSlider);
+  }
+
+  public List<String> labels() {
+    return List.of("focalLength", "objectRotateSpeed");
+  }
+
+  public Element save(Document document) {
+    Element element = document.createElement("objectRotation");
+    Element x = document.createElement("x");
+    x.appendChild(document.createTextNode(Double.toString(rotation.getX())));
+    Element y = document.createElement("y");
+    y.appendChild(document.createTextNode(Double.toString(rotation.getY())));
+    Element z = document.createElement("z");
+    z.appendChild(document.createTextNode(Double.toString(rotation.getZ())));
+    element.appendChild(x);
+    element.appendChild(y);
+    element.appendChild(z);
+    return element;
+  }
+
+  public void load(Element root) {
+    Element element = (Element) root.getElementsByTagName("objectRotation").item(0);
+    Element x = (Element) element.getElementsByTagName("x").item(0);
+    Element y = (Element) element.getElementsByTagName("y").item(0);
+    Element z = (Element) element.getElementsByTagName("z").item(0);
+    rotation = new Vector3(
+      Double.parseDouble(x.getTextContent()),
+      Double.parseDouble(y.getTextContent()),
+      Double.parseDouble(z.getTextContent())
+    );
+    setObjRotate(rotation);
+  }
+}

src/main/resources/fxml/main.fxml

@@ -22,15 +22,7 @@
       <fx:include fx:id="effects" source="effects.fxml"/>
    </TitledPane>
 <TitledPane fx:id="objTitledPane" animated="false" collapsible="false" layoutX="424.0" layoutY="436.0" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="213.0" prefWidth="402.0" text="3D .obj file settings">
-  <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="359.0">
+   <fx:include fx:id="obj" source="obj.fxml"/>
-    <Slider fx:id="focalLengthSlider" blockIncrement="0.01" layoutX="116.0" layoutY="22.0" majorTickUnit="0.2" max="2.0" min="1.0E-5" prefHeight="42.0" prefWidth="258.0" showTickLabels="true" showTickMarks="true" value="1.0" />
-    <Label layoutX="34.0" layoutY="21.0" text="Focal length" />
-         <Slider fx:id="objectRotateSpeedSlider" blockIncrement="0.005" layoutX="116.0" layoutY="81.0" majorTickUnit="0.1" max="1.0" prefHeight="42.0" prefWidth="258.0" showTickLabels="true" showTickMarks="true" />
-         <Label layoutX="9.0" layoutY="80.0" text="3D Rotate speed" />
-         <CheckBox fx:id="rotateCheckBox" layoutX="90.0" layoutY="143.0" mnemonicParsing="false" text="Rotate with Mouse (Esc to disable)" />
-         <SVGPath fx:id="focalLengthMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="19.0" pickOnBounds="true" />
-         <SVGPath fx:id="objectRotateSpeedMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="78.0" pickOnBounds="true" />
-  </AnchorPane>
 </TitledPane>
    <AnchorPane id="control-pane" layoutX="10.0" layoutY="37.0" prefHeight="313.0" prefWidth="402.0">
       <children>

src/main/resources/fxml/obj.fxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.shape.SVGPath?>
+
+<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="359.0"  xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sh.ball.gui.controller.ObjController">
+    <Slider fx:id="focalLengthSlider" blockIncrement="0.01" layoutX="116.0" layoutY="22.0" majorTickUnit="0.2" max="2.0" min="1.0E-5" prefHeight="42.0" prefWidth="258.0" showTickLabels="true" showTickMarks="true" value="1.0" />
+    <Label layoutX="34.0" layoutY="21.0" text="Focal length" />
+    <Slider fx:id="objectRotateSpeedSlider" blockIncrement="0.005" layoutX="116.0" layoutY="81.0" majorTickUnit="0.1" max="1.0" prefHeight="42.0" prefWidth="258.0" showTickLabels="true" showTickMarks="true" />
+    <Label layoutX="9.0" layoutY="80.0" text="3D Rotate speed" />
+    <CheckBox fx:id="rotateCheckBox" layoutX="90.0" layoutY="143.0" mnemonicParsing="false" text="Rotate with Mouse (Esc to disable)" />
+    <SVGPath fx:id="focalLengthMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="19.0" pickOnBounds="true" />
+    <SVGPath fx:id="objectRotateSpeedMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="78.0" pickOnBounds="true" />
+</AnchorPane>