Merge pull request #21 from jameshball/obj-rotate

Allow 3D model's rotation to be managed manually

src/main/java/sh/ball/audio/Effect.java

@@ -0,0 +1,7 @@
+package sh.ball.audio;
+
+import sh.ball.shapes.Vector2;
+
+public interface Effect {
+  Vector2 apply(int count, Vector2 vector);
+}

src/main/java/sh/ball/audio/FrameProducer.java

@@ -25,7 +25,13 @@ public class FrameProducer<T> implements Runnable {
   }
 
   public Object setFrameSettings(Object settings) {
+    return setFrameSettings(settings, false);
+  }
+
+  public Object setFrameSettings(Object settings, boolean flushFrames) {
+    if (flushFrames) {
       renderer.flushFrames();
+    }
     return frames.setFrameSettings(settings);
   }
 }

src/main/java/sh/ball/engine/Vector3.java

@@ -79,6 +79,7 @@ public final class Vector3 {
     );
   }
 
+  // TODO: Is this correctly used?!
   public double distance(Vector3 vector) {
     return Math.sqrt(Math.pow(vector.x, 2) + Math.pow(vector.y, 2) + Math.pow(vector.z, 2));
   }

src/main/java/sh/ball/engine/WorldObject.java

@@ -2,7 +2,6 @@ package sh.ball.engine;
 
 import com.mokiat.data.front.parser.*;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;

src/main/java/sh/ball/gui/Controller.java

@@ -31,6 +31,7 @@ import org.xml.sax.SAXException;
 import sh.ball.audio.effect.TranslateEffect;
 import sh.ball.engine.Vector3;
 import sh.ball.parser.obj.ObjFrameSettings;
+import sh.ball.parser.obj.ObjSettingsFactory;
 import sh.ball.parser.obj.ObjParser;
 import sh.ball.parser.ParserFactory;
 import sh.ball.shapes.Shape;
@@ -40,6 +41,7 @@ public class Controller implements Initializable {
 
   private static final int SAMPLE_RATE = 192000;
   private static final InputStream DEFAULT_OBJ = Controller.class.getResourceAsStream("/models/cube.obj");
+  private static final double DEFAULT_ROTATE_SPEED = 0.1;
 
   private final FileChooser fileChooser = new FileChooser();
   private final Renderer<List<Shape>> renderer;
@@ -90,6 +92,18 @@ public class Controller implements Initializable {
   @FXML
   private TextField cameraZTextField;
   @FXML
+  private Slider objectRotateSpeedSlider;
+  @FXML
+  private Label objectRotateSpeedLabel;
+  @FXML
+  private TextField rotateXTextField;
+  @FXML
+  private TextField rotateYTextField;
+  @FXML
+  private TextField rotateZTextField;
+  @FXML
+  private Button resetRotationButton;
+  @FXML
   private CheckBox vectorCancellingCheckBox;
   @FXML
   private Slider vectorCancellingSlider;
@@ -117,7 +131,9 @@ public class Controller implements Initializable {
       scaleSlider,
       new SliderUpdater<>(scaleLabel::setText, scaleEffect::setScale),
       focalLengthSlider,
-      new SliderUpdater<>(focalLengthLabel::setText, this::setFocalLength)
+      new SliderUpdater<>(focalLengthLabel::setText, this::setFocalLength),
+      objectRotateSpeedSlider,
+      new SliderUpdater<>(objectRotateSpeedLabel::setText, this::setObjectRotateSpeed)
     );
   }
 
@@ -132,6 +148,7 @@ public class Controller implements Initializable {
     );
   }
 
+  // TODO: Refactor and clean up duplication
   @Override
   public void initialize(URL url, ResourceBundle resourceBundle) {
     Map<Slider, SliderUpdater<Double>> sliders = initializeSliderMap();
@@ -153,16 +170,29 @@ public class Controller implements Initializable {
     translationYTextField.textProperty().addListener(translationUpdate);
 
     InvalidationListener cameraPosUpdate = observable ->
-      producer.setFrameSettings(new ObjFrameSettings(new Vector3(
+      producer.setFrameSettings(ObjSettingsFactory.cameraPosition(new Vector3(
         tryParse(cameraXTextField.getText()),
         tryParse(cameraYTextField.getText()),
         tryParse(cameraZTextField.getText())
-    )));
+    )), true);
 
     cameraXTextField.textProperty().addListener(cameraPosUpdate);
     cameraYTextField.textProperty().addListener(cameraPosUpdate);
     cameraZTextField.textProperty().addListener(cameraPosUpdate);
 
+    InvalidationListener rotateUpdate = observable ->
+      producer.setFrameSettings(ObjSettingsFactory.rotation(new Vector3(
+        tryParse(rotateXTextField.getText()),
+        tryParse(rotateYTextField.getText()),
+        tryParse(rotateZTextField.getText())
+      )));
+
+    rotateXTextField.textProperty().addListener(rotateUpdate);
+    rotateYTextField.textProperty().addListener(rotateUpdate);
+    rotateZTextField.textProperty().addListener(rotateUpdate);
+
+    resetRotationButton.setOnAction(e -> producer.setFrameSettings(ObjSettingsFactory.resetRotation()));
+
     InvalidationListener vectorCancellingListener = e ->
       updateEffect(EffectType.VECTOR_CANCELLING, vectorCancellingCheckBox.isSelected(),
         EffectFactory.vectorCancelling((int) vectorCancellingSlider.getValue()));
@@ -183,6 +213,8 @@ public class Controller implements Initializable {
       }
     });
 
+    setObjectRotateSpeed(DEFAULT_ROTATE_SPEED);
+
     renderer.addEffect(EffectType.SCALE, scaleEffect);
     renderer.addEffect(EffectType.ROTATE, rotateEffect);
     renderer.addEffect(EffectType.TRANSLATE, translateEffect);
@@ -192,12 +224,21 @@ public class Controller implements Initializable {
   }
 
   private void setFocalLength(double focalLength) {
-    Vector3 pos = (Vector3) producer.setFrameSettings(new ObjFrameSettings(focalLength));
+    Vector3 pos = (Vector3) producer.setFrameSettings(
+      ObjSettingsFactory.focalLength(focalLength),
+      true
+    );
     cameraXTextField.setText(String.valueOf(pos.getX()));
     cameraYTextField.setText(String.valueOf(pos.getY()));
     cameraZTextField.setText(String.valueOf(pos.getZ()));
   }
 
+  private void setObjectRotateSpeed(double rotateSpeed) {
+    producer.setFrameSettings(
+      ObjSettingsFactory.rotateSpeed((Math.exp(3 * rotateSpeed) - 1) / 50)
+    );
+  }
+
   private double tryParse(String value) {
     try {
       return Double.parseDouble(value);

src/main/java/sh/ball/gui/EffectType.java

@@ -0,0 +1,5 @@
+package sh.ball.gui;
+
+enum EffectType {
+  VECTOR_CANCELLING
+}

src/main/java/sh/ball/parser/obj/ObjFrameSet.java

@@ -12,36 +12,44 @@ public class ObjFrameSet implements FrameSet<List<Shape>> {
 
   private final WorldObject object;
   private final Camera camera;
-  private final Vector3 rotation;
   private final boolean isDefaultPosition;
 
-  public ObjFrameSet(WorldObject object, Camera camera, Vector3 rotation, boolean isDefaultPosition) {
+  private Vector3 rotation = new Vector3();
+  private Double rotateSpeed = 0.0;
+
+  public ObjFrameSet(WorldObject object, Camera camera, boolean isDefaultPosition) {
     this.object = object;
     this.camera = camera;
-    this.rotation = rotation;
     this.isDefaultPosition = isDefaultPosition;
   }
 
   @Override
   public List<Shape> next() {
-    object.rotate(rotation);
+    object.rotate(rotation.scale(rotateSpeed));
     return camera.draw(object);
   }
 
+  // TODO: Refactor!
   @Override
   public Object setFrameSettings(Object settings) {
     if (settings instanceof ObjFrameSettings obj) {
-      Double focalLength = obj.focalLength();
+      if (obj.focalLength != null && camera.getFocalLength() != obj.focalLength) {
-      Vector3 cameraPos = obj.cameraPos();
+        camera.setFocalLength(obj.focalLength);
-
-      if (focalLength != null && camera.getFocalLength() != focalLength) {
-        camera.setFocalLength(focalLength);
         if (isDefaultPosition) {
           camera.findZPos(object);
         }
       }
-      if (cameraPos != null && camera.getPos() != cameraPos) {
+      if (obj.cameraPos != null && camera.getPos() != obj.cameraPos) {
-        camera.setPos(cameraPos);
+        camera.setPos(obj.cameraPos);
+      }
+      if (obj.rotation != null) {
+        this.rotation = obj.rotation;
+      }
+      if (obj.rotateSpeed != null) {
+        this.rotateSpeed = obj.rotateSpeed;
+      }
+      if (obj.resetRotation) {
+        object.resetRotation();
       }
     }
 

src/main/java/sh/ball/parser/obj/ObjFrameSettings.java

@@ -2,13 +2,28 @@ package sh.ball.parser.obj;
 
 import sh.ball.engine.Vector3;
 
-public record ObjFrameSettings(Double focalLength, Vector3 cameraPos) {
+public class ObjFrameSettings {
 
-  public ObjFrameSettings(double focalLength) {
+  protected Double focalLength;
-    this(focalLength, null);
+  protected Vector3 cameraPos;
+  protected Vector3 rotation;
+  protected Double rotateSpeed;
+  protected boolean resetRotation = false;
+
+  protected ObjFrameSettings(double focalLength) {
+    this.focalLength = focalLength;
   }
 
-  public ObjFrameSettings(Vector3 cameraPos) {
+  protected ObjFrameSettings(Vector3 cameraPos) {
-    this(null, cameraPos);
+    this.cameraPos = cameraPos;
+  }
+
+  protected ObjFrameSettings(Vector3 rotation, Double rotateSpeed) {
+    this.rotation = rotation;
+    this.rotateSpeed = rotateSpeed;
+  }
+
+  protected ObjFrameSettings(boolean resetRotation) {
+    this.resetRotation = resetRotation;
   }
 }

src/main/java/sh/ball/parser/obj/ObjParser.java

@@ -16,27 +16,22 @@ import sh.ball.shapes.Shape;
 
 public class ObjParser extends FileParser<FrameSet<List<Shape>>> {
 
-  private static final float DEFAULT_ROTATE_SPEED = 3;
-
-  private final Vector3 rotation;
   private final boolean isDefaultPosition;
   private final InputStream input;
   private final Camera camera;
 
   private WorldObject object;
 
-  public ObjParser(InputStream input, float rotateSpeed, float cameraX, float cameraY, float cameraZ,
+  public ObjParser(InputStream input, float cameraX, float cameraY, float cameraZ,
                    float focalLength, boolean isDefaultPosition) {
-    rotateSpeed *= Math.PI / 1000;
     this.input = input;
     this.isDefaultPosition = isDefaultPosition;
     Vector3 cameraPos = new Vector3(cameraX, cameraY, cameraZ);
     this.camera = new Camera(focalLength, cameraPos);
-    this.rotation = new Vector3(0, rotateSpeed, rotateSpeed);
   }
 
   public ObjParser(InputStream input, float focalLength) {
-    this(input, DEFAULT_ROTATE_SPEED, 0, 0, 0, focalLength, true);
+    this(input, 0, 0, 0, focalLength, true);
   }
 
   public ObjParser(InputStream input) {
@@ -60,7 +55,7 @@ public class ObjParser extends FileParser<FrameSet<List<Shape>>> {
       camera.findZPos(object);
     }
 
-    return new ObjFrameSet(object, camera, rotation, isDefaultPosition);
+    return new ObjFrameSet(object, camera, isDefaultPosition);
   }
 
   // If camera position arguments haven't been specified, automatically work out the position of
@@ -75,8 +70,4 @@ public class ObjParser extends FileParser<FrameSet<List<Shape>>> {
   public static boolean isObjFile(String path) {
     return path.matches(".*\\.obj");
   }
-
-  public void setCameraPos(Vector3 vector) {
-    camera.setPos(vector);
-  }
 }

src/main/java/sh/ball/parser/obj/ObjSettingsFactory.java

@@ -0,0 +1,26 @@
+package sh.ball.parser.obj;
+
+import sh.ball.engine.Vector3;
+
+public class ObjSettingsFactory {
+
+  public static ObjFrameSettings focalLength(double focalLength) {
+    return new ObjFrameSettings(focalLength);
+  }
+
+  public static ObjFrameSettings cameraPosition(Vector3 cameraPos) {
+    return new ObjFrameSettings(cameraPos);
+  }
+
+  public static ObjFrameSettings rotation(Vector3 rotation) {
+    return new ObjFrameSettings(rotation, null);
+  }
+
+  public static ObjFrameSettings rotateSpeed(double rotateSpeed) {
+    return new ObjFrameSettings(null, rotateSpeed);
+  }
+
+  public static ObjFrameSettings resetRotation() {
+    return new ObjFrameSettings(true);
+  }
+}

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" prefWidth="400.0" vgap="10" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
+<GridPane alignment="center" hgap="10" prefHeight="653.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="602.0" prefWidth="400.0">
+  <AnchorPane prefHeight="737.0" prefWidth="400.0">
     <Button fx:id="chooseFileButton" layoutX="8.0" layoutY="15.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="119.0" text="Choose File" />
-    <SplitPane dividerPositions="0.3406015037593984, 0.669548872180451" layoutX="8.0" layoutY="63.0" orientation="VERTICAL" prefHeight="533.0" prefWidth="386.0">
+    <SplitPane dividerPositions="0.31499312242090777, 0.6158872077028884" layoutX="6.0" layoutY="63.0" orientation="VERTICAL" prefHeight="583.0" prefWidth="388.0">
-      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="271.0" prefWidth="385.0">
+      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="178.0" prefWidth="396.0">
         <Slider fx:id="rotateSpeedSlider" layoutX="116.0" layoutY="79.0" max="10.0" prefHeight="14.0" prefWidth="198.0" />
         <Label layoutX="37.0" layoutY="77.0" text="Rotate speed" />
         <Label fx:id="rotateSpeedLabel" layoutX="316.0" layoutY="77.0" maxWidth="40.0" text="0" />
@@ -43,7 +43,7 @@
       </AnchorPane>
          <TitledPane animated="false" collapsible="false" prefHeight="169.0" prefWidth="385.0" text="Effects" SplitPane.resizableWithParent="false">
            <content>
-             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+             <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="66.0" prefWidth="383.0">
                   <children>
                      <CheckBox fx:id="vectorCancellingCheckBox" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" text="Vector cancelling" />
                      <Slider fx:id="vectorCancellingSlider" blockIncrement="1.0" disable="true" layoutX="141.0" layoutY="16.0" majorTickUnit="1.0" max="10.0" min="2.0" minorTickCount="0" prefHeight="33.0" prefWidth="198.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="2.0" />
@@ -53,18 +53,29 @@
                </AnchorPane>
            </content>
          </TitledPane>
-      <TitledPane fx:id="objTitledPane" animated="false" collapsible="false" prefHeight="186.0" prefWidth="385.0" text="3D .obj file settings" SplitPane.resizableWithParent="false">
+      <TitledPane fx:id="objTitledPane" animated="false" collapsible="false" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="400.0" prefWidth="385.0" text="3D .obj file settings" SplitPane.resizableWithParent="false">
-        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="96.0" prefWidth="382.0">
+        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="155.0" prefWidth="384.0">
           <Slider fx:id="focalLengthSlider" blockIncrement="2.0" layoutX="116.0" layoutY="15.0" max="2.0" min="1.0E-5" prefHeight="14.0" prefWidth="198.0" value="1.0" />
           <Label layoutX="43.0" layoutY="14.0" text="Focal length" />
           <Label fx:id="focalLengthLabel" layoutX="316.0" layoutY="14.0" text="1" />
-               <TextField fx:id="cameraXTextField" layoutX="134.0" layoutY="39.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <TextField fx:id="cameraXTextField" layoutX="134.0" layoutY="42.0" prefHeight="26.0" prefWidth="58.0" text="0" />
-               <Label layoutX="44.0" layoutY="44.0" text="Camera pos" />
+               <Label layoutX="44.0" layoutY="47.0" text="Camera pos" />
-               <Label layoutX="118.0" layoutY="44.0" text="x :" />
+               <Label layoutX="118.0" layoutY="47.0" text="x :" />
-               <Label layoutX="199.0" layoutY="43.0" text="y :" />
+               <Label layoutX="199.0" layoutY="46.0" text="y :" />
-               <TextField fx:id="cameraYTextField" layoutX="218.0" layoutY="39.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <TextField fx:id="cameraYTextField" layoutX="218.0" layoutY="42.0" prefHeight="26.0" prefWidth="58.0" text="0" />
-               <Label layoutX="283.0" layoutY="43.0" text="z :" />
+               <Label layoutX="283.0" layoutY="46.0" text="z :" />
-               <TextField fx:id="cameraZTextField" layoutX="302.0" layoutY="39.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <TextField fx:id="cameraZTextField" layoutX="302.0" layoutY="42.0" prefHeight="26.0" prefWidth="58.0" text="-2.5" />
+               <Slider fx:id="objectRotateSpeedSlider" blockIncrement="2.0" layoutX="116.0" layoutY="83.0" max="1.0" prefHeight="14.0" prefWidth="198.0" value="0.1" />
+               <Label layoutX="36.0" layoutY="82.0" text="Rotate speed" />
+               <Label fx:id="objectRotateSpeedLabel" layoutX="316.0" layoutY="82.0" text="0.1" />
+               <TextField fx:id="rotateXTextField" layoutX="134.0" layoutY="111.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <Label layoutX="62.0" layoutY="116.0" text="Rotation" />
+               <Label layoutX="118.0" layoutY="116.0" text="x :" />
+               <Label layoutX="199.0" layoutY="115.0" text="y :" />
+               <TextField fx:id="rotateYTextField" layoutX="218.0" layoutY="111.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <Label layoutX="283.0" layoutY="115.0" text="z :" />
+               <TextField fx:id="rotateZTextField" layoutX="302.0" layoutY="111.0" prefHeight="26.0" prefWidth="58.0" text="0" />
+               <Button fx:id="resetRotationButton" layoutX="145.0" layoutY="153.0" mnemonicParsing="false" text="Reset Rotation" />
         </AnchorPane>
       </TitledPane>
     </SplitPane>