diff --git a/.gitattributes b/.gitattributes index 097f9f9..c3786a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,6 @@ # # Linux start script should use lf /gradlew text eol=lf - # These are Windows script files and should use crlf *.bat text eol=crlf - +*.glb filter=lfs diff=lfs merge=lfs -text diff --git a/app/src/main/java/chess/App.java b/app/src/main/java/chess/App.java index 2de48b3..0fd5919 100644 --- a/app/src/main/java/chess/App.java +++ b/app/src/main/java/chess/App.java @@ -1,16 +1,17 @@ package chess; -import chess.view.consolerender.Colors; - import java.util.Scanner; +import chess.view.consolerender.Colors; + public class App { public static void main(String[] args) { System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET); System.out.println(""" Pick the version to use: 1 - Console - 2 - Window."""); + 2 - Window + 3 - 3D."""); switch (new Scanner(System.in).nextLine()) { case "1", "Console", "console": ConsoleMain.main(args); @@ -18,6 +19,9 @@ public class App { case "2", "Window", "window": SwingMain.main(args); break; + case "3", "3D", "3d": + OpenGLMain.main(args); + break; default: System.out.println("Invalid input"); break; diff --git a/app/src/main/java/chess/OpenGLMain.java b/app/src/main/java/chess/OpenGLMain.java new file mode 100644 index 0000000..3929ae5 --- /dev/null +++ b/app/src/main/java/chess/OpenGLMain.java @@ -0,0 +1,9 @@ +package chess; + +import chess.view.DDDrender.Window; + +public class OpenGLMain { + public static void main(String[] args) { + new Window().run(); + } +} diff --git a/app/src/main/java/chess/view/render/Camera.java b/app/src/main/java/chess/view/DDDrender/Camera.java similarity index 98% rename from app/src/main/java/chess/view/render/Camera.java rename to app/src/main/java/chess/view/DDDrender/Camera.java index 58a403a..8efdbeb 100644 --- a/app/src/main/java/chess/view/render/Camera.java +++ b/app/src/main/java/chess/view/DDDrender/Camera.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; import org.joml.Matrix4f; import org.joml.Vector3f; diff --git a/app/src/main/java/chess/view/render/ElementBuffer.java b/app/src/main/java/chess/view/DDDrender/ElementBuffer.java similarity index 95% rename from app/src/main/java/chess/view/render/ElementBuffer.java rename to app/src/main/java/chess/view/DDDrender/ElementBuffer.java index 2ac7746..fc55725 100644 --- a/app/src/main/java/chess/view/render/ElementBuffer.java +++ b/app/src/main/java/chess/view/DDDrender/ElementBuffer.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; import org.lwjgl.opengl.GL30; diff --git a/app/src/main/java/chess/view/render/Renderer.java b/app/src/main/java/chess/view/DDDrender/Renderer.java similarity index 95% rename from app/src/main/java/chess/view/render/Renderer.java rename to app/src/main/java/chess/view/DDDrender/Renderer.java index 3ddeed8..2033785 100644 --- a/app/src/main/java/chess/view/render/Renderer.java +++ b/app/src/main/java/chess/view/DDDrender/Renderer.java @@ -1,11 +1,11 @@ -package chess.view.render; +package chess.view.DDDrender; + +import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; import org.joml.Vector3f; -import org.lwjgl.opengl.*; +import org.lwjgl.opengl.GL30; -import chess.view.render.shader.BoardShader; - -import static org.lwjgl.opengl.GL30.*; +import chess.view.DDDrender.shader.BoardShader; public class Renderer { private BoardShader shader; diff --git a/app/src/main/java/chess/view/render/VertexArray.java b/app/src/main/java/chess/view/DDDrender/VertexArray.java similarity index 96% rename from app/src/main/java/chess/view/render/VertexArray.java rename to app/src/main/java/chess/view/DDDrender/VertexArray.java index 13bd712..85d879a 100644 --- a/app/src/main/java/chess/view/render/VertexArray.java +++ b/app/src/main/java/chess/view/DDDrender/VertexArray.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/chess/view/render/VertexAttribPointer.java b/app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java similarity index 71% rename from app/src/main/java/chess/view/render/VertexAttribPointer.java rename to app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java index b2335eb..f4af07e 100644 --- a/app/src/main/java/chess/view/render/VertexAttribPointer.java +++ b/app/src/main/java/chess/view/DDDrender/VertexAttribPointer.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; public record VertexAttribPointer(int index, int size, int offset) { diff --git a/app/src/main/java/chess/view/render/VertexBuffer.java b/app/src/main/java/chess/view/DDDrender/VertexBuffer.java similarity index 97% rename from app/src/main/java/chess/view/render/VertexBuffer.java rename to app/src/main/java/chess/view/DDDrender/VertexBuffer.java index 1e6f347..1995736 100644 --- a/app/src/main/java/chess/view/render/VertexBuffer.java +++ b/app/src/main/java/chess/view/DDDrender/VertexBuffer.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; import static org.lwjgl.opengl.GL11.GL_FLOAT; diff --git a/app/src/main/java/chess/view/render/Window.java b/app/src/main/java/chess/view/DDDrender/Window.java similarity index 97% rename from app/src/main/java/chess/view/render/Window.java rename to app/src/main/java/chess/view/DDDrender/Window.java index 6855dea..e2b8ff7 100644 --- a/app/src/main/java/chess/view/render/Window.java +++ b/app/src/main/java/chess/view/DDDrender/Window.java @@ -1,4 +1,4 @@ -package chess.view.render; +package chess.view.DDDrender; import org.lwjgl.*; import org.lwjgl.glfw.*; @@ -26,6 +26,10 @@ public class Window { this.cam = new Camera(); } + public static void main(String[] args) { + new Window().run(); + } + public void run() { System.out.println("LWJGL " + Version.getVersion() + "!"); diff --git a/app/src/main/java/chess/view/render/shader/BoardShader.java b/app/src/main/java/chess/view/DDDrender/shader/BoardShader.java similarity index 96% rename from app/src/main/java/chess/view/render/shader/BoardShader.java rename to app/src/main/java/chess/view/DDDrender/shader/BoardShader.java index dee6299..cc3fdbe 100644 --- a/app/src/main/java/chess/view/render/shader/BoardShader.java +++ b/app/src/main/java/chess/view/DDDrender/shader/BoardShader.java @@ -1,4 +1,4 @@ -package chess.view.render.shader; +package chess.view.DDDrender.shader; import org.joml.Matrix4f; diff --git a/app/src/main/java/chess/view/render/shader/ShaderProgram.java b/app/src/main/java/chess/view/DDDrender/shader/ShaderProgram.java similarity index 98% rename from app/src/main/java/chess/view/render/shader/ShaderProgram.java rename to app/src/main/java/chess/view/DDDrender/shader/ShaderProgram.java index 5853f75..cfeb07f 100644 --- a/app/src/main/java/chess/view/render/shader/ShaderProgram.java +++ b/app/src/main/java/chess/view/DDDrender/shader/ShaderProgram.java @@ -1,4 +1,4 @@ -package chess.view.render.shader; +package chess.view.DDDrender.shader; import java.nio.FloatBuffer; import java.nio.IntBuffer;