diff --git a/GameEngine/src/main/java/Main.java b/GameEngine/src/main/java/Main.java index 055d229..9fa6e95 100644 --- a/GameEngine/src/main/java/Main.java +++ b/GameEngine/src/main/java/Main.java @@ -4,7 +4,6 @@ public class Main { public static void main(String[] args) { Window window = Window.get(); - window.run(); - + window.runWithEditor(); } } \ No newline at end of file diff --git a/GameEngine/src/main/java/gameEngine/GameEditor.java b/GameEngine/src/main/java/gameEngine/GameEditor.java index 8a0b4a3..b19bdd1 100644 --- a/GameEngine/src/main/java/gameEngine/GameEditor.java +++ b/GameEngine/src/main/java/gameEngine/GameEditor.java @@ -5,6 +5,7 @@ import gameEngine.entites.gameComponents.GameComponent; import gameEngine.entites.gameComponents.*; import gameEngine.scenes.*; +import gameEngine.views.Window; import org.joml.Vector3f; import javax.swing.*; @@ -32,15 +33,15 @@ private String lastLoadedName; private Vector3f lastLoadedPos, lastLoadedRot, lastLoadedScale; - - public GameEditor() { + public GameEditor() + { setTitle("Game Object Editor"); setSize(500, 400); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); // 閉じられないようにする setLayout(null); // レイアウトを絶対座標に設定 initializeUIComponents();// 各UI要素の初期化 initializeUpdateTimer(); // 定期的にリスト更新を行うタイマーを初期化 - setVisible(true); // フレームを表示 + setVisible(true); // フレームを表示} } // UI要素を初期化し、配置関数を呼び出す diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index a14618b..d442522 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -36,7 +36,6 @@ this.width = 1200; this.height = 900; this.title = "HelloWorld"; - gameEditor = new GameEditor(); init(); } @@ -99,8 +98,14 @@ return window; } + public void runWithEditor() { + gameEditor = new GameEditor(); + run(); + } + public void run() { System.out.println("Hello LWJGL " + Version.getVersion() + "!"); + Window.changeScene(0); loop(); glfwFreeCallbacks(glfwWindow); glfwDestroyWindow(glfwWindow); @@ -154,8 +159,6 @@ glfwShowWindow(glfwWindow); GL.createCapabilities(); - - Window.changeScene(0); } private void loop() {