diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 00000000..118be082 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,12 @@ +module sh.ball { + requires javafx.controls; + requires javafx.graphics; + requires javafx.fxml; + requires com.xtaudio.xt; + requires java.xml; + requires org.jsoup; + requires java.data.front; + requires org.jgrapht.core; + + opens sh.ball.gui; +} \ No newline at end of file diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java index 006ca501..4d6520ef 100644 --- a/src/main/java/sh/ball/gui/Controller.java +++ b/src/main/java/sh/ball/gui/Controller.java @@ -1,6 +1,5 @@ package sh.ball.gui; -import java.net.URISyntaxException; import sh.ball.audio.AudioPlayer; import sh.ball.audio.FrameProducer; import sh.ball.engine.Vector3; @@ -27,13 +26,12 @@ import org.xml.sax.SAXException; import sh.ball.parser.ObjParser; import sh.ball.shapes.Shape; import sh.ball.shapes.Vector2; -import sh.ball.util.ClassLoaderUtil; public class Controller implements Initializable { private static final int BUFFER_SIZE = 20; private static final int SAMPLE_RATE = 192000; - private static final String DEFAULT_FILE = "models/cube.obj"; + private static final String DEFAULT_FILE = "src/main/resources/models/cube.obj"; private final FileChooser fileChooser = new FileChooser(); private final BlockingQueue> frameQueue = new ArrayBlockingQueue<>(BUFFER_SIZE); @@ -96,7 +94,7 @@ public class Controller implements Initializable { @Override public void initialize(URL url, ResourceBundle resourceBundle) { - chooseFile(DEFAULT_FILE); + chooseFile(new File(DEFAULT_FILE)); Map> sliders = initializeSliderMap(); @@ -161,14 +159,6 @@ public class Controller implements Initializable { } } - private void chooseFile(String path) { - try { - chooseFile(new File(ClassLoaderUtil.getResource(path, this.getClass()).toURI())); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - public void setStage(Stage stage) { this.stage = stage; }