Implement toggle to remove hidden edges from objects

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>sh.ball</groupId>
     <artifactId>osci-render</artifactId>
-    <version>1.20.3</version>
+    <version>1.21.3</version>
 
     <name>osci-render</name>
 

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

@@ -28,6 +28,7 @@ public class CameraDrawKernel extends Kernel {
   private float cameraPosY;
   private float cameraPosZ;
   private float focalLength;
+  private int hideEdges = 0;
 
   public CameraDrawKernel() {}
 
@@ -45,6 +46,7 @@ public class CameraDrawKernel extends Kernel {
       }
     }
     prevObject = object;
+    hideEdges = object.edgesHidden() ? 1 : 0;
     Vector3 rotation = object.getRotation();
     Vector3 position = object.getPosition();
     this.rotationX = (float) rotation.x;
@@ -70,11 +72,15 @@ public class CameraDrawKernel extends Kernel {
 
     linesList = new ArrayList<>();
 
-    for (int i = 0; i < vertices.length / 3; i += 2) {
+    for (int i = 0; i < vertices.length / 3; i++) {
-      if (!Float.isNaN(vertexResult[2 * i]) && !Float.isNaN(vertexResult[2 * i + 2])) {
+      int nextOffset = 0;
+      if (i < vertices.length / 3 - 1) {
+        nextOffset = 2 * i + 2;
+      }
+      if (!Float.isNaN(vertexResult[2 * i]) && !Float.isNaN(vertexResult[nextOffset])) {
         linesList.add(new Line(
           new Vector2(vertexResult[2 * i], vertexResult[2 * i + 1]),
-          new Vector2(vertexResult[2 * i + 2], vertexResult[2 * i + 3])
+          new Vector2(vertexResult[nextOffset], vertexResult[nextOffset + 1])
         ));
       }
     }
@@ -127,6 +133,9 @@ public class CameraDrawKernel extends Kernel {
     float rotatedY = y3 + positionY;
     float rotatedZ = z3 + positionZ;
 
+    boolean intersects = false;
+
+    if (hideEdges == 1) {
       float rotatedCameraPosX = cameraPosX - positionX;
       float rotatedCameraPosY = cameraPosY - positionY;
       float rotatedCameraPosZ = cameraPosZ - positionZ;
@@ -154,8 +163,6 @@ public class CameraDrawKernel extends Kernel {
       diry /= length;
       dirz /= length;
 
-    boolean intersects = false;
-
       for (int j = 0; j < triangles.length / 9 && !intersects; j++) {
         float v1x = triangles[9 * j];
         float v1y = triangles[9 * j + 1];
@@ -218,6 +225,7 @@ public class CameraDrawKernel extends Kernel {
           intersects = true;
         }
       }
+    }
 
     if (intersects) {
       vertexResult[2 * i] = Float.NaN;

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

@@ -22,6 +22,7 @@ public class WorldObject {
   private List<Vector3> vertexPath;
   private Vector3 position;
   private Vector3 rotation;
+  private boolean hideEdges = false;
 
   private WorldObject(List<Vector3> objVertices, List<Vector3> vertexPath, Vector3 position,
                       Vector3 rotation) {
@@ -56,8 +57,6 @@ public class WorldObject {
     Graph<Vector3, DefaultWeightedEdge> graph = new DefaultUndirectedWeightedGraph<>(
       DefaultWeightedEdge.class);
 
-    vertexPath = new ArrayList<>();
-
     // Add all lines in frame to graph as vertices and edges. Edge weight is determined by the
     // length of the line as this is directly proportional to draw time.
     for (Line3D edge : edges) {
@@ -79,12 +78,7 @@ public class WorldObject {
     for (Set<Vector3> vertices : inspector.connectedSets()) {
       AsSubgraph<Vector3, DefaultWeightedEdge> subgraph = new AsSubgraph<>(graph, vertices);
       ChinesePostman<Vector3, DefaultWeightedEdge> cp = new ChinesePostman<>();
-      List<Vector3> path = cp.getCPPSolution(subgraph).getVertexList();
+      vertexPath.addAll(cp.getCPPSolution(subgraph).getVertexList());
-
-      for (int i = 1; i < path.size(); i++) {
-        vertexPath.add(path.get(i - 1));
-        vertexPath.add(path.get(i));
-      }
     }
   }
 
@@ -215,4 +209,12 @@ public class WorldObject {
     return new WorldObject(new ArrayList<>(objVertices), new ArrayList<>(vertexPath), position,
       rotation);
   }
+
+  public void hideEdges(boolean hideEdges) {
+    this.hideEdges = hideEdges;
+  }
+
+  public boolean edgesHidden() {
+    return hideEdges;
+  }
 }

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

@@ -122,6 +122,8 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
   @FXML
   private CheckMenuItem flipYCheckMenuItem;
   @FXML
+  private CheckMenuItem hideHiddenMeshesCheckMenuItem;
+  @FXML
   private Spinner<Integer> midiChannelSpinner;
   @FXML
   private Spinner<Double> translationIncrementSpinner;
@@ -268,6 +270,8 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     flipXCheckMenuItem.selectedProperty().addListener((e, old, flip) -> audioPlayer.flipXChannel(flip));
     flipYCheckMenuItem.selectedProperty().addListener((e, old, flip) -> audioPlayer.flipYChannel(flip));
 
+    hideHiddenMeshesCheckMenuItem.selectedProperty().addListener((e, old, hidden) -> objController.hideHiddenMeshes(hidden));
+
     NumberFormat format = NumberFormat.getIntegerInstance();
     UnaryOperator<TextFormatter.Change> filter = c -> {
       if (c.isContentChange()) {
@@ -404,6 +408,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
     objController.updateFocalLength();
     if (oldSettings instanceof ObjFrameSettings settings) {
       objController.setObjRotate(settings.baseRotation, settings.currentRotation);
+      objController.hideHiddenMeshes(settings.hideEdges);
     }
     executor.submit(producer);
     effectsController.restartEffects();
@@ -718,6 +723,10 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
       root.appendChild(flipX);
       root.appendChild(flipY);
 
+      Element hiddenEdges = document.createElement("hiddenEdges");
+      hiddenEdges.appendChild(document.createTextNode(String.valueOf(hideHiddenMeshesCheckMenuItem.isSelected())));
+      root.appendChild(hiddenEdges);
+
       Element translationIncrement = document.createElement("translationIncrement");
       translationIncrement.appendChild(document.createTextNode(translationIncrementSpinner.getValue().toString()));
       root.appendChild(translationIncrement);
@@ -814,6 +823,11 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
         flipYCheckMenuItem.setSelected(Boolean.parseBoolean(flipY.getTextContent()));
       }
 
+      Element hiddenEdges = (Element) root.getElementsByTagName("hiddenEdges").item(0);
+      if (hiddenEdges != null) {
+        hideHiddenMeshesCheckMenuItem.setSelected(Boolean.parseBoolean(hiddenEdges.getTextContent()));
+      }
+
       Element translationIncrement = (Element) root.getElementsByTagName("translationIncrement").item(0);
       if (translationIncrement != null) {
         translationIncrementSpinner.getValueFactory().setValue(Double.parseDouble(translationIncrement.getTextContent()));

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

@@ -121,6 +121,10 @@ public class ObjController implements Initializable, SubController {
     producer.setFrameSettings(ObjSettingsFactory.rotation(baseRotation, currentRotation));
   }
 
+  public void hideHiddenMeshes(Boolean hidden) {
+    producer.setFrameSettings(ObjSettingsFactory.hideEdges(hidden));
+  }
+
   @Override
   public void initialize(URL url, ResourceBundle resourceBundle) {
     focalLengthSlider.valueProperty().addListener((source, oldValue, newValue) ->

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

@@ -10,14 +10,16 @@ public class ObjFrameSettings {
   public Vector3 currentRotation;
   public Double rotateSpeed;
   public boolean resetRotation = false;
+  public Boolean hideEdges = null;
 
-  protected ObjFrameSettings(Double focalLength, Vector3 cameraPos, Vector3 baseRotation, Vector3 currentRotation, Double rotateSpeed, boolean resetRotation) {
+  protected ObjFrameSettings(Double focalLength, Vector3 cameraPos, Vector3 baseRotation, Vector3 currentRotation, Double rotateSpeed, boolean resetRotation, Boolean hideEdges) {
     this.focalLength = focalLength;
     this.cameraPos = cameraPos;
     this.baseRotation = baseRotation;
     this.currentRotation = currentRotation;
     this.rotateSpeed = rotateSpeed;
     this.resetRotation = resetRotation;
+    this.hideEdges = hideEdges;
   }
 
   protected ObjFrameSettings(double focalLength) {

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

@@ -67,12 +67,15 @@ public class ObjFrameSource implements FrameSource<List<Shape>> {
       if (obj.resetRotation) {
         object.resetRotation();
       }
+      if (obj.hideEdges != null) {
+        object.hideEdges(obj.hideEdges);
+      }
     }
   }
 
   // TODO: Refactor!
   @Override
   public Object getFrameSettings() {
-    return ObjSettingsFactory.rotation(baseRotation, currentRotation);
+    return new ObjFrameSettings(null, null, baseRotation, currentRotation, null, false, object.edgesHidden());
   }
 }

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

@@ -17,7 +17,7 @@ public class ObjSettingsFactory {
   }
 
   public static ObjFrameSettings rotation(Vector3 baseRotation, Vector3 currentRotation) {
-    return new ObjFrameSettings(null, null, baseRotation, currentRotation, null, false);
+    return new ObjFrameSettings(null, null, baseRotation, currentRotation, null, false, null);
   }
 
   public static ObjFrameSettings rotateSpeed(double rotateSpeed) {
@@ -27,4 +27,8 @@ public class ObjSettingsFactory {
   public static ObjFrameSettings resetRotation() {
     return new ObjFrameSettings(true);
   }
+
+  public static ObjFrameSettings hideEdges(Boolean hideEdges) {
+    return new ObjFrameSettings(null, null, null, null, null, false, hideEdges);
+  }
 }

src/main/resources/fxml/main.fxml

@@ -70,6 +70,7 @@
            <items>
                <CheckMenuItem fx:id="flipXCheckMenuItem" mnemonicParsing="false" text="Flip X Direction" />
                <CheckMenuItem fx:id="flipYCheckMenuItem" mnemonicParsing="false" text="Flip Y Direction" />
+               <CheckMenuItem fx:id="hideHiddenMeshesCheckMenuItem" mnemonicParsing="false" text="Hide Hidden Meshes" />
            </items>
          </Menu>
          <Menu mnemonicParsing="false" text="Controls">