dev #12

Merged
Persson-dev merged 44 commits from dev into main 2025-05-17 15:05:24 +00:00
12 changed files with 34 additions and 18 deletions
Showing only changes of commit 4bd16026e1 - Show all commits

3
.gitattributes vendored
View File

@@ -3,7 +3,6 @@
# #
# Linux start script should use lf # Linux start script should use lf
/gradlew text eol=lf /gradlew text eol=lf
# These are Windows script files and should use crlf # These are Windows script files and should use crlf
*.bat text eol=crlf *.bat text eol=crlf
*.glb filter=lfs diff=lfs merge=lfs -text

View File

@@ -1,16 +1,17 @@
package chess; package chess;
import chess.view.consolerender.Colors;
import java.util.Scanner; import java.util.Scanner;
import chess.view.consolerender.Colors;
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET); System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET);
System.out.println(""" System.out.println("""
Pick the version to use: Pick the version to use:
1 - Console 1 - Console
2 - Window."""); 2 - Window
3 - 3D.""");
switch (new Scanner(System.in).nextLine()) { switch (new Scanner(System.in).nextLine()) {
case "1", "Console", "console": case "1", "Console", "console":
ConsoleMain.main(args); ConsoleMain.main(args);
@@ -18,6 +19,9 @@ public class App {
case "2", "Window", "window": case "2", "Window", "window":
SwingMain.main(args); SwingMain.main(args);
break; break;
case "3", "3D", "3d":
OpenGLMain.main(args);
break;
default: default:
System.out.println("Invalid input"); System.out.println("Invalid input");
break; break;

View File

@@ -0,0 +1,9 @@
package chess;
import chess.view.DDDrender.Window;
public class OpenGLMain {
public static void main(String[] args) {
new Window().run();
}
}

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import org.joml.Matrix4f; import org.joml.Matrix4f;
import org.joml.Vector3f; import org.joml.Vector3f;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;

View File

@@ -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.joml.Vector3f;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.GL30;
import chess.view.render.shader.BoardShader; import chess.view.DDDrender.shader.BoardShader;
import static org.lwjgl.opengl.GL30.*;
public class Renderer { public class Renderer {
private BoardShader shader; private BoardShader shader;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
public record VertexAttribPointer(int index, int size, int offset) { public record VertexAttribPointer(int index, int size, int offset) {

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import static org.lwjgl.opengl.GL11.GL_FLOAT; import static org.lwjgl.opengl.GL11.GL_FLOAT;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import org.lwjgl.*; import org.lwjgl.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
@@ -26,6 +26,10 @@ public class Window {
this.cam = new Camera(); this.cam = new Camera();
} }
public static void main(String[] args) {
new Window().run();
}
public void run() { public void run() {
System.out.println("LWJGL " + Version.getVersion() + "!"); System.out.println("LWJGL " + Version.getVersion() + "!");

View File

@@ -1,4 +1,4 @@
package chess.view.render.shader; package chess.view.DDDrender.shader;
import org.joml.Matrix4f; import org.joml.Matrix4f;

View File

@@ -1,4 +1,4 @@
package chess.view.render.shader; package chess.view.DDDrender.shader;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;