Add vertex adds it to the level's pipe, don't add a vertex if there's…

… no pipe
goofans · Dec 25, 2023 · be43dc5 · be43dc5
1 parent 071f038
commit be43dc5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/main/java/com/WooGLEFX/Engine/FXCreator.java b/src/main/java/com/WooGLEFX/Engine/FXCreator.java
@@ -614,7 +614,7 @@ public static void buttons(VBox vBox) throws IOException {
         addCompositegeomButton.setOnAction(e -> Main.addCompositegeom(Main.getLevel().getSceneObject()));
         addHingeButton.setOnAction(e -> Main.addHinge(Main.getLevel().getSceneObject()));
         autoPipeButton.setOnAction(e -> Main.autoPipe());
-        addVertexButton.setOnAction(e -> Main.addPipeVertex(Main.getLevel().getSceneObject()));
+        addVertexButton.setOnAction(e -> Main.addPipeVertex(Main.getLevel().getLevelObject()));
         addFireButton.setOnAction(e -> Main.addFire(Main.getLevel().getLevelObject()));
         addLinearforcefieldButton.setOnAction(e -> Main.addLinearForcefield(Main.getLevel().getSceneObject()));
         addRadialforcefieldButton.setOnAction(e -> Main.addRadialForcefield(Main.getLevel().getSceneObject()));

diff --git a/src/main/java/com/WooGLEFX/Engine/Main.java b/src/main/java/com/WooGLEFX/Engine/Main.java
@@ -1740,13 +1740,27 @@ public static void autoPipe() {
 
     public static void addPipeVertex(EditorObject parent) {
         // get the previous vertex before this one
+        EditorObject pipe = null;
+        if (parent instanceof Pipe) {
+            pipe = parent;
+        } else {
+            for (EditorObject child : parent.getChildren()) {
+                if (child instanceof Pipe) {
+                    pipe = child;
+                    break;
+                }
+            }
+            if (pipe == null) {
+                Alarms.errorMessage("You must create a pipe to add the vertex to.");
+            }
+        }
         Vertex previous = null;
-        for (EditorObject child : parent.getChildren()) {
+        for (EditorObject child : pipe.getChildren()) {
             if (child instanceof Vertex) {
                 previous = (Vertex) child;
             }
         }
-        Vertex obj = (Vertex) EditorObject.create("Vertex", new EditorAttribute[0], parent);
+        Vertex obj = (Vertex) EditorObject.create("Vertex", new EditorAttribute[0], pipe);
         obj.setPrevious(previous);
         obj.setAttribute("x", getScreenCenter().getX());
         obj.setAttribute("y", -getScreenCenter().getY());

diff --git a/src/main/java/com/WooGLEFX/GUI/Alarms.java b/src/main/java/com/WooGLEFX/GUI/Alarms.java
@@ -42,6 +42,16 @@ public static void errorMessage(Exception error) {
         logger.error("", error);
     }
 
+    public static void errorMessage(String error) {
+        Alert alert = new Alert(AlertType.ERROR);
+        alert.setResizable(true);
+        alert.setHeaderText("Error");
+        alert.setContentText(error);
+        alert.show();
+        // Show the message in the console
+        logger.error(error);
+    }
+
     public static void loadingResourcesError(String error) {
         Alert alert = new Alert(AlertType.ERROR);
         alert.setResizable(true);