diff --git a/app/src/main/java/chess/App.java b/app/src/main/java/chess/App.java index 923f845..ba3a9ef 100644 --- a/app/src/main/java/chess/App.java +++ b/app/src/main/java/chess/App.java @@ -3,11 +3,11 @@ */ package chess; -import chess.io.CommandExecutor; -import chess.io.commands.NewGameCommand; +import chess.controller.CommandExecutor; +import chess.controller.commands.NewGameCommand; import chess.model.ChessBoard; import chess.model.Game; -import chess.simplerender.Window; +import chess.view.simplerender.Window; public class App { public static void main(String[] args) { diff --git a/app/src/main/java/chess/io/Command.java b/app/src/main/java/chess/controller/Command.java similarity index 95% rename from app/src/main/java/chess/io/Command.java rename to app/src/main/java/chess/controller/Command.java index 363d83b..d2c3230 100644 --- a/app/src/main/java/chess/io/Command.java +++ b/app/src/main/java/chess/controller/Command.java @@ -1,4 +1,4 @@ -package chess.io; +package chess.controller; import chess.model.Game; diff --git a/app/src/main/java/chess/io/CommandExecutor.java b/app/src/main/java/chess/controller/CommandExecutor.java similarity index 96% rename from app/src/main/java/chess/io/CommandExecutor.java rename to app/src/main/java/chess/controller/CommandExecutor.java index 93f0b8f..3dc0949 100644 --- a/app/src/main/java/chess/io/CommandExecutor.java +++ b/app/src/main/java/chess/controller/CommandExecutor.java @@ -1,6 +1,6 @@ -package chess.io; +package chess.controller; -import chess.io.Command.CommandResult; +import chess.controller.Command.CommandResult; import chess.model.Game; import chess.model.Game.GameStatus; diff --git a/app/src/main/java/chess/io/OutputSystem.java b/app/src/main/java/chess/controller/OutputSystem.java similarity index 93% rename from app/src/main/java/chess/io/OutputSystem.java rename to app/src/main/java/chess/controller/OutputSystem.java index 837bf70..38b310e 100644 --- a/app/src/main/java/chess/io/OutputSystem.java +++ b/app/src/main/java/chess/controller/OutputSystem.java @@ -1,4 +1,4 @@ -package chess.io; +package chess.controller; import chess.model.Color; import chess.model.Coordinate; diff --git a/app/src/main/java/chess/io/PlayerCommand.java b/app/src/main/java/chess/controller/PlayerCommand.java similarity index 85% rename from app/src/main/java/chess/io/PlayerCommand.java rename to app/src/main/java/chess/controller/PlayerCommand.java index 3b3ad28..cd86d35 100644 --- a/app/src/main/java/chess/io/PlayerCommand.java +++ b/app/src/main/java/chess/controller/PlayerCommand.java @@ -1,4 +1,4 @@ -package chess.io; +package chess.controller; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/CastlingCommand.java b/app/src/main/java/chess/controller/commands/CastlingCommand.java similarity index 81% rename from app/src/main/java/chess/io/commands/CastlingCommand.java rename to app/src/main/java/chess/controller/commands/CastlingCommand.java index 13cca93..9d2633a 100644 --- a/app/src/main/java/chess/io/commands/CastlingCommand.java +++ b/app/src/main/java/chess/controller/commands/CastlingCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.OutputSystem; -import chess.io.PlayerCommand; +import chess.controller.OutputSystem; +import chess.controller.PlayerCommand; import chess.model.Game; public class CastlingCommand extends PlayerCommand { diff --git a/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java b/app/src/main/java/chess/controller/commands/GetAllowedMovesCommand.java similarity index 89% rename from app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java rename to app/src/main/java/chess/controller/commands/GetAllowedMovesCommand.java index 8e308ea..efc66a4 100644 --- a/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java +++ b/app/src/main/java/chess/controller/commands/GetAllowedMovesCommand.java @@ -1,10 +1,10 @@ -package chess.io.commands; +package chess.controller.commands; import java.util.ArrayList; import java.util.List; -import chess.io.Command; -import chess.io.OutputSystem; +import chess.controller.Command; +import chess.controller.OutputSystem; import chess.model.ChessBoard; import chess.model.Coordinate; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/GetPieceAtCommand.java b/app/src/main/java/chess/controller/commands/GetPieceAtCommand.java similarity index 84% rename from app/src/main/java/chess/io/commands/GetPieceAtCommand.java rename to app/src/main/java/chess/controller/commands/GetPieceAtCommand.java index 112e362..ac8bfb5 100644 --- a/app/src/main/java/chess/io/commands/GetPieceAtCommand.java +++ b/app/src/main/java/chess/controller/commands/GetPieceAtCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.Command; -import chess.io.OutputSystem; +import chess.controller.Command; +import chess.controller.OutputSystem; import chess.model.Coordinate; import chess.model.Game; import chess.model.Piece; diff --git a/app/src/main/java/chess/io/commands/GrandCastlingCommand.java b/app/src/main/java/chess/controller/commands/GrandCastlingCommand.java similarity index 81% rename from app/src/main/java/chess/io/commands/GrandCastlingCommand.java rename to app/src/main/java/chess/controller/commands/GrandCastlingCommand.java index 19b9289..c3b28e4 100644 --- a/app/src/main/java/chess/io/commands/GrandCastlingCommand.java +++ b/app/src/main/java/chess/controller/commands/GrandCastlingCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.OutputSystem; -import chess.io.PlayerCommand; +import chess.controller.OutputSystem; +import chess.controller.PlayerCommand; import chess.model.Game; public class GrandCastlingCommand extends PlayerCommand { diff --git a/app/src/main/java/chess/io/commands/MoveCommand.java b/app/src/main/java/chess/controller/commands/MoveCommand.java similarity index 93% rename from app/src/main/java/chess/io/commands/MoveCommand.java rename to app/src/main/java/chess/controller/commands/MoveCommand.java index bf82dfb..819765e 100644 --- a/app/src/main/java/chess/io/commands/MoveCommand.java +++ b/app/src/main/java/chess/controller/commands/MoveCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.OutputSystem; -import chess.io.PlayerCommand; +import chess.controller.OutputSystem; +import chess.controller.PlayerCommand; import chess.model.ChessBoard; import chess.model.Coordinate; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/NewGameCommand.java b/app/src/main/java/chess/controller/commands/NewGameCommand.java similarity index 95% rename from app/src/main/java/chess/io/commands/NewGameCommand.java rename to app/src/main/java/chess/controller/commands/NewGameCommand.java index 166aa5b..fe9fb9a 100644 --- a/app/src/main/java/chess/io/commands/NewGameCommand.java +++ b/app/src/main/java/chess/controller/commands/NewGameCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.Command; -import chess.io.OutputSystem; +import chess.controller.Command; +import chess.controller.OutputSystem; import chess.model.ChessBoard; import chess.model.Color; import chess.model.Coordinate; diff --git a/app/src/main/java/chess/io/commands/PromoteCommand.java b/app/src/main/java/chess/controller/commands/PromoteCommand.java similarity index 94% rename from app/src/main/java/chess/io/commands/PromoteCommand.java rename to app/src/main/java/chess/controller/commands/PromoteCommand.java index 47cd382..1bc0194 100644 --- a/app/src/main/java/chess/io/commands/PromoteCommand.java +++ b/app/src/main/java/chess/controller/commands/PromoteCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.OutputSystem; -import chess.io.PlayerCommand; +import chess.controller.OutputSystem; +import chess.controller.PlayerCommand; import chess.model.ChessBoard; import chess.model.Color; import chess.model.Coordinate; diff --git a/app/src/main/java/chess/io/commands/SurrenderCommand.java b/app/src/main/java/chess/controller/commands/SurrenderCommand.java similarity index 79% rename from app/src/main/java/chess/io/commands/SurrenderCommand.java rename to app/src/main/java/chess/controller/commands/SurrenderCommand.java index b8a6761..7c6e2bc 100644 --- a/app/src/main/java/chess/io/commands/SurrenderCommand.java +++ b/app/src/main/java/chess/controller/commands/SurrenderCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.Command; -import chess.io.OutputSystem; +import chess.controller.Command; +import chess.controller.OutputSystem; import chess.model.Color; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/UndoCommand.java b/app/src/main/java/chess/controller/commands/UndoCommand.java similarity index 65% rename from app/src/main/java/chess/io/commands/UndoCommand.java rename to app/src/main/java/chess/controller/commands/UndoCommand.java index e648e99..de847a1 100644 --- a/app/src/main/java/chess/io/commands/UndoCommand.java +++ b/app/src/main/java/chess/controller/commands/UndoCommand.java @@ -1,7 +1,7 @@ -package chess.io.commands; +package chess.controller.commands; -import chess.io.Command; -import chess.io.OutputSystem; +import chess.controller.Command; +import chess.controller.OutputSystem; import chess.model.Game; public class UndoCommand extends Command{ diff --git a/app/src/main/java/chess/render/Camera.java b/app/src/main/java/chess/view/render/Camera.java similarity index 99% rename from app/src/main/java/chess/render/Camera.java rename to app/src/main/java/chess/view/render/Camera.java index fe72244..58a403a 100644 --- a/app/src/main/java/chess/render/Camera.java +++ b/app/src/main/java/chess/view/render/Camera.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; import org.joml.Matrix4f; import org.joml.Vector3f; diff --git a/app/src/main/java/chess/render/ElementBuffer.java b/app/src/main/java/chess/view/render/ElementBuffer.java similarity index 96% rename from app/src/main/java/chess/render/ElementBuffer.java rename to app/src/main/java/chess/view/render/ElementBuffer.java index c7a7bd0..2ac7746 100644 --- a/app/src/main/java/chess/render/ElementBuffer.java +++ b/app/src/main/java/chess/view/render/ElementBuffer.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; import org.lwjgl.opengl.GL30; diff --git a/app/src/main/java/chess/render/Renderer.java b/app/src/main/java/chess/view/render/Renderer.java similarity index 98% rename from app/src/main/java/chess/render/Renderer.java rename to app/src/main/java/chess/view/render/Renderer.java index 4e579af..3ddeed8 100644 --- a/app/src/main/java/chess/render/Renderer.java +++ b/app/src/main/java/chess/view/render/Renderer.java @@ -1,10 +1,11 @@ -package chess.render; +package chess.view.render; import org.joml.Vector3f; import org.lwjgl.opengl.*; +import chess.view.render.shader.BoardShader; + import static org.lwjgl.opengl.GL30.*; -import chess.render.shader.BoardShader; public class Renderer { private BoardShader shader; diff --git a/app/src/main/java/chess/render/VertexArray.java b/app/src/main/java/chess/view/render/VertexArray.java similarity index 97% rename from app/src/main/java/chess/render/VertexArray.java rename to app/src/main/java/chess/view/render/VertexArray.java index 8f966fa..13bd712 100644 --- a/app/src/main/java/chess/render/VertexArray.java +++ b/app/src/main/java/chess/view/render/VertexArray.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/chess/render/VertexAttribPointer.java b/app/src/main/java/chess/view/render/VertexAttribPointer.java similarity index 73% rename from app/src/main/java/chess/render/VertexAttribPointer.java rename to app/src/main/java/chess/view/render/VertexAttribPointer.java index f201f75..b2335eb 100644 --- a/app/src/main/java/chess/render/VertexAttribPointer.java +++ b/app/src/main/java/chess/view/render/VertexAttribPointer.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; public record VertexAttribPointer(int index, int size, int offset) { diff --git a/app/src/main/java/chess/render/VertexBuffer.java b/app/src/main/java/chess/view/render/VertexBuffer.java similarity index 98% rename from app/src/main/java/chess/render/VertexBuffer.java rename to app/src/main/java/chess/view/render/VertexBuffer.java index 5f92a36..1e6f347 100644 --- a/app/src/main/java/chess/render/VertexBuffer.java +++ b/app/src/main/java/chess/view/render/VertexBuffer.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; import static org.lwjgl.opengl.GL11.GL_FLOAT; diff --git a/app/src/main/java/chess/render/Window.java b/app/src/main/java/chess/view/render/Window.java similarity index 99% rename from app/src/main/java/chess/render/Window.java rename to app/src/main/java/chess/view/render/Window.java index 6956c59..6855dea 100644 --- a/app/src/main/java/chess/render/Window.java +++ b/app/src/main/java/chess/view/render/Window.java @@ -1,4 +1,4 @@ -package chess.render; +package chess.view.render; import org.lwjgl.*; import org.lwjgl.glfw.*; diff --git a/app/src/main/java/chess/render/shader/BoardShader.java b/app/src/main/java/chess/view/render/shader/BoardShader.java similarity index 96% rename from app/src/main/java/chess/render/shader/BoardShader.java rename to app/src/main/java/chess/view/render/shader/BoardShader.java index 345bb5b..dee6299 100644 --- a/app/src/main/java/chess/render/shader/BoardShader.java +++ b/app/src/main/java/chess/view/render/shader/BoardShader.java @@ -1,4 +1,4 @@ -package chess.render.shader; +package chess.view.render.shader; import org.joml.Matrix4f; diff --git a/app/src/main/java/chess/render/shader/ShaderProgram.java b/app/src/main/java/chess/view/render/shader/ShaderProgram.java similarity index 98% rename from app/src/main/java/chess/render/shader/ShaderProgram.java rename to app/src/main/java/chess/view/render/shader/ShaderProgram.java index e2d8430..5853f75 100644 --- a/app/src/main/java/chess/render/shader/ShaderProgram.java +++ b/app/src/main/java/chess/view/render/shader/ShaderProgram.java @@ -1,4 +1,4 @@ -package chess.render.shader; +package chess.view.render.shader; import java.nio.FloatBuffer; import java.nio.IntBuffer; diff --git a/app/src/main/java/chess/simplerender/PieceIcon.java b/app/src/main/java/chess/view/simplerender/PieceIcon.java similarity index 97% rename from app/src/main/java/chess/simplerender/PieceIcon.java rename to app/src/main/java/chess/view/simplerender/PieceIcon.java index 5d201e7..f846988 100644 --- a/app/src/main/java/chess/simplerender/PieceIcon.java +++ b/app/src/main/java/chess/view/simplerender/PieceIcon.java @@ -1,4 +1,4 @@ -package chess.simplerender; +package chess.view.simplerender; import java.awt.Image; import java.util.HashMap; diff --git a/app/src/main/java/chess/simplerender/Window.java b/app/src/main/java/chess/view/simplerender/Window.java similarity index 92% rename from app/src/main/java/chess/simplerender/Window.java rename to app/src/main/java/chess/view/simplerender/Window.java index eb510cb..e0b78d6 100644 --- a/app/src/main/java/chess/simplerender/Window.java +++ b/app/src/main/java/chess/view/simplerender/Window.java @@ -1,4 +1,4 @@ -package chess.simplerender; +package chess.view.simplerender; import java.awt.Color; import java.awt.GridLayout; @@ -12,15 +12,15 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingUtilities; -import chess.io.Command; -import chess.io.Command.CommandResult; -import chess.io.CommandExecutor; -import chess.io.OutputSystem; -import chess.io.commands.GetAllowedMovesCommand; -import chess.io.commands.GetPieceAtCommand; -import chess.io.commands.MoveCommand; -import chess.io.commands.PromoteCommand; -import chess.io.commands.PromoteCommand.PromoteType; +import chess.controller.Command; +import chess.controller.CommandExecutor; +import chess.controller.OutputSystem; +import chess.controller.Command.CommandResult; +import chess.controller.commands.GetAllowedMovesCommand; +import chess.controller.commands.GetPieceAtCommand; +import chess.controller.commands.MoveCommand; +import chess.controller.commands.PromoteCommand; +import chess.controller.commands.PromoteCommand.PromoteType; import chess.model.Coordinate; import chess.model.Move; import chess.model.Piece;