From 9f35bd3c308d0834a9da664fa864f64b860f1c41 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sun, 27 Apr 2025 10:12:52 +0200 Subject: [PATCH] opengl package --- .../main/java/chess/view/DDDrender/BoardModelLoader.java | 4 ++++ app/src/main/java/chess/view/DDDrender/DDDModel.java | 2 ++ app/src/main/java/chess/view/DDDrender/DDDPlacement.java | 6 +++++- app/src/main/java/chess/view/DDDrender/ModelLoader.java | 3 +++ app/src/main/java/chess/view/DDDrender/Renderer.java | 1 + .../chess/view/DDDrender/{ => opengl}/ElementBuffer.java | 2 +- .../java/chess/view/DDDrender/{ => opengl}/VertexArray.java | 2 +- .../view/DDDrender/{ => opengl}/VertexAttribPointer.java | 2 +- .../chess/view/DDDrender/{ => opengl}/VertexBuffer.java | 2 +- 9 files changed, 19 insertions(+), 5 deletions(-) rename app/src/main/java/chess/view/DDDrender/{ => opengl}/ElementBuffer.java (95%) rename app/src/main/java/chess/view/DDDrender/{ => opengl}/VertexArray.java (96%) rename app/src/main/java/chess/view/DDDrender/{ => opengl}/VertexAttribPointer.java (66%) rename app/src/main/java/chess/view/DDDrender/{ => opengl}/VertexBuffer.java (97%) diff --git a/app/src/main/java/chess/view/DDDrender/BoardModelLoader.java b/app/src/main/java/chess/view/DDDrender/BoardModelLoader.java index 64ede5e..24144e1 100644 --- a/app/src/main/java/chess/view/DDDrender/BoardModelLoader.java +++ b/app/src/main/java/chess/view/DDDrender/BoardModelLoader.java @@ -2,6 +2,10 @@ package chess.view.DDDrender; import org.joml.Vector3f; +import chess.view.DDDrender.opengl.ElementBuffer; +import chess.view.DDDrender.opengl.VertexArray; +import chess.view.DDDrender.opengl.VertexBuffer; + public class BoardModelLoader { private static int BOARD_WIDTH = 8; diff --git a/app/src/main/java/chess/view/DDDrender/DDDModel.java b/app/src/main/java/chess/view/DDDrender/DDDModel.java index 577daab..5e83978 100644 --- a/app/src/main/java/chess/view/DDDrender/DDDModel.java +++ b/app/src/main/java/chess/view/DDDrender/DDDModel.java @@ -2,6 +2,8 @@ package chess.view.DDDrender; import java.util.List; +import chess.view.DDDrender.opengl.VertexArray; + public class DDDModel { private final List vaos; diff --git a/app/src/main/java/chess/view/DDDrender/DDDPlacement.java b/app/src/main/java/chess/view/DDDrender/DDDPlacement.java index cf35bcb..9300027 100644 --- a/app/src/main/java/chess/view/DDDrender/DDDPlacement.java +++ b/app/src/main/java/chess/view/DDDrender/DDDPlacement.java @@ -6,7 +6,11 @@ import chess.model.Coordinate; class DDDPlacement { static public Vector2f coordinates_to_vector(Coordinate coo) { - return new Vector2f(1.0f - 0.125f - coo.getX() * 0.250f, 1.0f - 0.125f - coo.getY() * 0.250f); + return coordinates_to_vector(coo.getX(), coo.getY()); + } + + static public Vector2f coordinates_to_vector(float x, float y) { + return new Vector2f(1.0f - 0.125f - x * 0.250f, 1.0f - 0.125f - y * 0.250f); } } \ No newline at end of file diff --git a/app/src/main/java/chess/view/DDDrender/ModelLoader.java b/app/src/main/java/chess/view/DDDrender/ModelLoader.java index 47048f1..de2beb5 100644 --- a/app/src/main/java/chess/view/DDDrender/ModelLoader.java +++ b/app/src/main/java/chess/view/DDDrender/ModelLoader.java @@ -18,6 +18,9 @@ import org.lwjgl.assimp.Assimp; import org.lwjgl.system.MemoryUtil; import chess.view.AssetManager; +import chess.view.DDDrender.opengl.ElementBuffer; +import chess.view.DDDrender.opengl.VertexArray; +import chess.view.DDDrender.opengl.VertexBuffer; public class ModelLoader { diff --git a/app/src/main/java/chess/view/DDDrender/Renderer.java b/app/src/main/java/chess/view/DDDrender/Renderer.java index 73bc8c5..4ffa5e5 100644 --- a/app/src/main/java/chess/view/DDDrender/Renderer.java +++ b/app/src/main/java/chess/view/DDDrender/Renderer.java @@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL30; import chess.model.Color; import chess.model.Coordinate; import chess.model.Piece; +import chess.view.DDDrender.opengl.VertexArray; import chess.view.DDDrender.shader.BoardShader; import chess.view.DDDrender.shader.PieceShader; import chess.view.DDDrender.shader.ShaderProgram; diff --git a/app/src/main/java/chess/view/DDDrender/ElementBuffer.java b/app/src/main/java/chess/view/DDDrender/opengl/ElementBuffer.java similarity index 95% rename from app/src/main/java/chess/view/DDDrender/ElementBuffer.java rename to app/src/main/java/chess/view/DDDrender/opengl/ElementBuffer.java index fc55725..bd89480 100644 --- a/app/src/main/java/chess/view/DDDrender/ElementBuffer.java +++ b/app/src/main/java/chess/view/DDDrender/opengl/ElementBuffer.java @@ -1,4 +1,4 @@ -package chess.view.DDDrender; +package chess.view.DDDrender.opengl; import org.lwjgl.opengl.GL30; diff --git a/app/src/main/java/chess/view/DDDrender/VertexArray.java b/app/src/main/java/chess/view/DDDrender/opengl/VertexArray.java similarity index 96% rename from app/src/main/java/chess/view/DDDrender/VertexArray.java rename to app/src/main/java/chess/view/DDDrender/opengl/VertexArray.java index 85d879a..74ee5d9 100644 --- a/app/src/main/java/chess/view/DDDrender/VertexArray.java +++ b/app/src/main/java/chess/view/DDDrender/opengl/VertexArray.java @@ -1,4 +1,4 @@ -package chess.view.DDDrender; +package chess.view.DDDrender.opengl; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java b/app/src/main/java/chess/view/DDDrender/opengl/VertexAttribPointer.java similarity index 66% rename from app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java rename to app/src/main/java/chess/view/DDDrender/opengl/VertexAttribPointer.java index f4af07e..dd4fc01 100644 --- a/app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java +++ b/app/src/main/java/chess/view/DDDrender/opengl/VertexAttribPointer.java @@ -1,4 +1,4 @@ -package chess.view.DDDrender; +package chess.view.DDDrender.opengl; public record VertexAttribPointer(int index, int size, int offset) { diff --git a/app/src/main/java/chess/view/DDDrender/VertexBuffer.java b/app/src/main/java/chess/view/DDDrender/opengl/VertexBuffer.java similarity index 97% rename from app/src/main/java/chess/view/DDDrender/VertexBuffer.java rename to app/src/main/java/chess/view/DDDrender/opengl/VertexBuffer.java index 1995736..82439ec 100644 --- a/app/src/main/java/chess/view/DDDrender/VertexBuffer.java +++ b/app/src/main/java/chess/view/DDDrender/opengl/VertexBuffer.java @@ -1,4 +1,4 @@ -package chess.view.DDDrender; +package chess.view.DDDrender.opengl; import static org.lwjgl.opengl.GL11.GL_FLOAT;