From 91ef650457af50e94a2b0b3d11788c237c584335 Mon Sep 17 00:00:00 2001 From: Andrew Lalis Date: Sat, 16 Jul 2022 12:39:27 +0200 Subject: [PATCH] Organized client code a bit more, and added GUI crosshair thing. --- .../aos2_client/render/GameRenderer.java | 21 +++++ .../aos2_client/render/ShaderProgram.java | 8 ++ .../render/{ => chunk}/BlockVertexData.java | 2 +- .../render/{ => chunk}/ChunkMesh.java | 9 +- .../render/{ => chunk}/ChunkMeshData.java | 2 +- .../{ => chunk}/ChunkMeshGenerator.java | 2 +- .../render/{ => chunk}/ChunkRenderer.java | 3 +- .../aos2_client/render/gui/GUIRenderer.java | 86 ++++++++++++++++++ .../aos2_client/render/gui/GUITexture.java | 52 +++++++++++ .../render/{ => gui}/font/Character.java | 2 +- .../render/{ => gui}/font/FontRenderer.java | 2 +- .../render/{ => gui}/font/FontType.java | 2 +- .../render/{ => gui}/font/GUIText.java | 5 +- .../render/{ => gui}/font/Line.java | 2 +- .../render/{ => gui}/font/MetaFile.java | 2 +- .../render/{ => gui/font}/TextMesh.java | 2 +- .../{ => gui}/font/TextMeshCreator.java | 2 +- .../render/{ => gui}/font/TextMeshData.java | 2 +- .../render/{ => gui}/font/Word.java | 2 +- client/src/main/resources/gui/crosshair.png | Bin 0 -> 218 bytes .../main/resources/shader/gui/fragment.glsl | 10 ++ .../src/main/resources/shader/gui/vertex.glsl | 14 +++ .../java/nl/andrewl/aos_core/ImageUtils.java | 28 ++++++ 23 files changed, 242 insertions(+), 18 deletions(-) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => chunk}/BlockVertexData.java (72%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => chunk}/ChunkMesh.java (91%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => chunk}/ChunkMeshData.java (76%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => chunk}/ChunkMeshGenerator.java (99%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => chunk}/ChunkRenderer.java (96%) create mode 100644 client/src/main/java/nl/andrewl/aos2_client/render/gui/GUIRenderer.java create mode 100644 client/src/main/java/nl/andrewl/aos2_client/render/gui/GUITexture.java rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/Character.java (98%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/FontRenderer.java (90%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/FontType.java (96%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/GUIText.java (97%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/Line.java (97%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/MetaFile.java (99%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui/font}/TextMesh.java (96%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/TextMeshCreator.java (98%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/TextMeshData.java (92%) rename client/src/main/java/nl/andrewl/aos2_client/render/{ => gui}/font/Word.java (95%) create mode 100644 client/src/main/resources/gui/crosshair.png create mode 100644 client/src/main/resources/shader/gui/fragment.glsl create mode 100644 client/src/main/resources/shader/gui/vertex.glsl create mode 100644 core/src/main/java/nl/andrewl/aos_core/ImageUtils.java diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/GameRenderer.java b/client/src/main/java/nl/andrewl/aos2_client/render/GameRenderer.java index 8924b61..296a6ec 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/GameRenderer.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/GameRenderer.java @@ -1,13 +1,19 @@ package nl.andrewl.aos2_client.render; import nl.andrewl.aos2_client.Camera; +import nl.andrewl.aos2_client.render.chunk.ChunkRenderer; +import nl.andrewl.aos2_client.render.gui.GUIRenderer; +import nl.andrewl.aos2_client.render.gui.GUITexture; import nl.andrewl.aos_core.model.World; import org.joml.Matrix4f; import org.lwjgl.glfw.*; import org.lwjgl.opengl.GL; +import org.lwjgl.opengl.GLUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.opengl.GL46.*; @@ -23,6 +29,7 @@ public class GameRenderer { private static final float Z_FAR = 500f; private final ChunkRenderer chunkRenderer; + private final GUIRenderer guiRenderer; private final Camera camera; private final World world; @@ -38,6 +45,7 @@ public class GameRenderer { public GameRenderer(World world) { this.world = world; this.chunkRenderer = new ChunkRenderer(); + this.guiRenderer = new GUIRenderer(); this.camera = new Camera(); this.perspectiveTransform = new Matrix4f(); @@ -52,6 +60,7 @@ public class GameRenderer { primaryMonitorSettings = glfwGetVideoMode(glfwGetPrimaryMonitor()); if (primaryMonitorSettings == null) throw new IllegalStateException("Could not get information about the primary monitory."); + log.debug("Primary monitor settings: Width: {}, Height: {}", primaryMonitorSettings.width(), primaryMonitorSettings.height()); windowHandle = glfwCreateWindow(screenWidth, screenHeight, "Ace of Shades 2", 0, 0); if (windowHandle == 0) throw new RuntimeException("Failed to create GLFW window."); fullscreen = false; @@ -80,6 +89,16 @@ public class GameRenderer { log.debug("Initialized OpenGL context."); chunkRenderer.setupShaderProgram(); + guiRenderer.setup(); + // TODO: More organized way to load textures for GUI. + try { + var crosshairTexture = new GUITexture("gui/crosshair.png"); + float size = 32; + crosshairTexture.getScale().set(size / screenWidth, size / screenHeight); + guiRenderer.addTexture(crosshairTexture); + } catch (IOException e) { + throw new RuntimeException(e); + } updatePerspective(); } @@ -143,12 +162,14 @@ public class GameRenderer { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); chunkRenderer.draw(camera, world); + guiRenderer.draw(); glfwSwapBuffers(windowHandle); glfwPollEvents(); } public void freeWindow() { + guiRenderer.free(); chunkRenderer.free(); GL.destroy(); Callbacks.glfwFreeCallbacks(windowHandle); diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/ShaderProgram.java b/client/src/main/java/nl/andrewl/aos2_client/render/ShaderProgram.java index 3eb1e63..7b1f30e 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/ShaderProgram.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/ShaderProgram.java @@ -28,10 +28,18 @@ public class ShaderProgram { glUseProgram(id); } + public void stopUsing() { + glUseProgram(0); + } + public int getUniform(String name) { return glGetUniformLocation(id, name); } + public void bindAttribute(int attribute, String variableName) { + glBindAttribLocation(id, attribute, variableName); + } + public void free() { glDeleteProgram(id); } diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/BlockVertexData.java b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/BlockVertexData.java similarity index 72% rename from client/src/main/java/nl/andrewl/aos2_client/render/BlockVertexData.java rename to client/src/main/java/nl/andrewl/aos2_client/render/chunk/BlockVertexData.java index a7fcb0e..661e5c5 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/BlockVertexData.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/BlockVertexData.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.chunk; import org.joml.Vector3f; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMesh.java b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMesh.java similarity index 91% rename from client/src/main/java/nl/andrewl/aos2_client/render/ChunkMesh.java rename to client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMesh.java index 9ddca49..4192bc9 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMesh.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMesh.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.chunk; import nl.andrewl.aos_core.model.Chunk; import nl.andrewl.aos_core.model.World; @@ -89,8 +89,15 @@ public class ChunkMesh { */ public void draw() { glBindVertexArray(vaoId); + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); + glEnableVertexAttribArray(2); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, eboId); glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, 0); + glDisableVertexAttribArray(0); + glDisableVertexAttribArray(1); + glDisableVertexAttribArray(2); + glBindVertexArray(0); } public void free() { diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshData.java b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshData.java similarity index 76% rename from client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshData.java rename to client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshData.java index 6bb789e..bf4a810 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshData.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshData.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.chunk; import java.nio.FloatBuffer; import java.nio.IntBuffer; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshGenerator.java b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshGenerator.java similarity index 99% rename from client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshGenerator.java rename to client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshGenerator.java index a45903a..f61a911 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkMeshGenerator.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkMeshGenerator.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.chunk; import nl.andrewl.aos_core.model.Chunk; import nl.andrewl.aos_core.model.World; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkRenderer.java b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkRenderer.java similarity index 96% rename from client/src/main/java/nl/andrewl/aos2_client/render/ChunkRenderer.java rename to client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkRenderer.java index 0ed70dc..db3b697 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/ChunkRenderer.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/chunk/ChunkRenderer.java @@ -1,6 +1,7 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.chunk; import nl.andrewl.aos2_client.Camera; +import nl.andrewl.aos2_client.render.ShaderProgram; import nl.andrewl.aos_core.model.Chunk; import nl.andrewl.aos_core.model.World; import org.joml.Matrix4f; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUIRenderer.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUIRenderer.java new file mode 100644 index 0000000..a263a4c --- /dev/null +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUIRenderer.java @@ -0,0 +1,86 @@ +package nl.andrewl.aos2_client.render.gui; + +import nl.andrewl.aos2_client.render.ShaderProgram; +import org.joml.Matrix4f; +import org.lwjgl.BufferUtils; + +import java.nio.FloatBuffer; +import java.util.ArrayList; +import java.util.List; + +import static org.lwjgl.opengl.GL46.*; + +/** + * Manages rendering of 2D GUI components like cross-hairs, inventory stuff, etc. + */ +public class GUIRenderer { + private int vaoId; + private int vboId; + private int vertexCount; + private ShaderProgram shaderProgram; + private int transformUniformLocation; + + + private final List guiTextures = new ArrayList<>(); + + public void addTexture(GUITexture texture) { + guiTextures.add(texture); + } + + public void setup() { + vaoId = glGenVertexArrays(); + vboId = glGenBuffers(); + FloatBuffer buffer = BufferUtils.createFloatBuffer(8); + buffer.put(new float[]{ + -1, 1, + -1, -1, + 1, 1, + 1, -1 + }); + buffer.flip(); + vertexCount = buffer.limit(); + glBindBuffer(GL_ARRAY_BUFFER, vboId); + glBufferData(GL_ARRAY_BUFFER, buffer, GL_STATIC_DRAW); + + glBindVertexArray(vaoId); + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, false, 2 * Float.BYTES, 0); + shaderProgram = new ShaderProgram.Builder() + .withShader("shader/gui/vertex.glsl", GL_VERTEX_SHADER) + .withShader("shader/gui/fragment.glsl", GL_FRAGMENT_SHADER) + .build(); + transformUniformLocation = shaderProgram.getUniform("transform"); + shaderProgram.bindAttribute(0, "position"); + } + + public void draw() { + shaderProgram.use(); + glBindVertexArray(vaoId); + glEnableVertexAttribArray(0); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDisable(GL_DEPTH_TEST); + for (var texture : guiTextures) { + glActiveTexture(GL_TEXTURE0); + Matrix4f transform = new Matrix4f() + .translate(texture.getPosition().x, texture.getPosition().y, 0) + .scale(texture.getScale().x, texture.getScale().y, 1); + float[] transformData = new float[16]; + transform.get(transformData); + glUniformMatrix4fv(transformUniformLocation, false, transformData); + glBindTexture(GL_TEXTURE_2D, texture.getTextureId()); + glDrawArrays(GL_TRIANGLE_STRIP, 0, vertexCount); + } + glDisable(GL_BLEND); + glEnable(GL_DEPTH_TEST); + glDisableVertexAttribArray(0); + glBindVertexArray(0); + } + + public void free() { + for (var tex : guiTextures) tex.free(); + glDeleteBuffers(vboId); + glDeleteVertexArrays(vaoId); + shaderProgram.free(); + } +} diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUITexture.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUITexture.java new file mode 100644 index 0000000..4cc345d --- /dev/null +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/GUITexture.java @@ -0,0 +1,52 @@ +package nl.andrewl.aos2_client.render.gui; + +import nl.andrewl.aos_core.ImageUtils; +import org.joml.Vector2f; +import org.joml.Vector3f; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import static org.lwjgl.opengl.GL46.*; + +public class GUITexture { + private final int textureId; + private final int width; + private final int height; + private final Vector2f position = new Vector2f(0, 0); + private final Vector2f scale = new Vector2f(1, 1); + + public GUITexture(String location) throws IOException { + try (var in = GUITexture.class.getClassLoader().getResourceAsStream(location)) { + if (in == null) throw new IOException("Couldn't load texture image from " + location); + BufferedImage img = ImageIO.read(in); + width = img.getWidth(); + height = img.getHeight(); + + textureId = glGenTextures(); + glBindTexture(GL_TEXTURE_2D, textureId); + glPixelStorei(GL_UNPACK_ALIGNMENT, textureId); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + var buf = ImageUtils.decodePng(img); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); + } + } + + public int getTextureId() { + return textureId; + } + + public Vector2f getPosition() { + return position; + } + + public Vector2f getScale() { + return scale; + } + + public void free() { + glDeleteTextures(textureId); + } +} diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/Character.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Character.java similarity index 98% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/Character.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Character.java index 9dd4951..57e2f19 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/Character.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Character.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; /** * Simple data structure class holding information about a certain glyph in the diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/FontRenderer.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontRenderer.java similarity index 90% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/FontRenderer.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontRenderer.java index b0d32bf..4e28da0 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/FontRenderer.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontRenderer.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import nl.andrewl.aos2_client.render.ShaderProgram; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/FontType.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontType.java similarity index 96% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/FontType.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontType.java index bc4303d..e6ed200 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/FontType.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/FontType.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import java.io.File; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/GUIText.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/GUIText.java similarity index 97% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/GUIText.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/GUIText.java index fc8b1a3..4ca0fee 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/GUIText.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/GUIText.java @@ -1,10 +1,7 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import org.joml.Vector2f; import org.joml.Vector3f; -import org.lwjgl.BufferUtils; - -import java.nio.FloatBuffer; import static org.lwjgl.opengl.GL46.*; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/Line.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Line.java similarity index 97% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/Line.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Line.java index c188d5b..5e3ae3e 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/Line.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Line.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import java.util.ArrayList; import java.util.List; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/MetaFile.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/MetaFile.java similarity index 99% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/MetaFile.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/MetaFile.java index 0cee884..92d2725 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/MetaFile.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/MetaFile.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import java.io.BufferedReader; import java.io.File; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/TextMesh.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMesh.java similarity index 96% rename from client/src/main/java/nl/andrewl/aos2_client/render/TextMesh.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMesh.java index 9b60716..dac8061 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/TextMesh.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMesh.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render; +package nl.andrewl.aos2_client.render.gui.font; import org.joml.Vector2f; import org.lwjgl.BufferUtils; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshCreator.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshCreator.java similarity index 98% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshCreator.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshCreator.java index 342b1cc..940dee7 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshCreator.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshCreator.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import java.io.File; import java.util.ArrayList; diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshData.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshData.java similarity index 92% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshData.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshData.java index b3149d4..54412b2 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/TextMeshData.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/TextMeshData.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; /** * Stores the vertex data for all the quads on which a text will be rendered. diff --git a/client/src/main/java/nl/andrewl/aos2_client/render/font/Word.java b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Word.java similarity index 95% rename from client/src/main/java/nl/andrewl/aos2_client/render/font/Word.java rename to client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Word.java index 254c4b3..46d88b3 100644 --- a/client/src/main/java/nl/andrewl/aos2_client/render/font/Word.java +++ b/client/src/main/java/nl/andrewl/aos2_client/render/gui/font/Word.java @@ -1,4 +1,4 @@ -package nl.andrewl.aos2_client.render.font; +package nl.andrewl.aos2_client.render.gui.font; import java.util.ArrayList; import java.util.List; diff --git a/client/src/main/resources/gui/crosshair.png b/client/src/main/resources/gui/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..e554cd8dc0547e499220d6f3a42f1eaef9c19497 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq z_>O=u<5X=vX`rBFiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xFo-U3d z5v^~p8FC$P;BdJpaj9aqOk)4O?XxaznUp2T)cDjteW6W`37_#KxAn%wR>gkeA3}lp zfS}=Z?bWd0(DL=Fkq!6F85Hig*(re~Ht;@R{1_ov@$tS@6G*_*)z4*}Q$iB}eV{?G literal 0 HcmV?d00001 diff --git a/client/src/main/resources/shader/gui/fragment.glsl b/client/src/main/resources/shader/gui/fragment.glsl new file mode 100644 index 0000000..7d55bc5 --- /dev/null +++ b/client/src/main/resources/shader/gui/fragment.glsl @@ -0,0 +1,10 @@ +#version 460 core + +in vec2 texturePosition; +out vec4 fragmentColor; + +uniform sampler2D guiTexture; + +void main() { + fragmentColor = texture(guiTexture, texturePosition); +} \ No newline at end of file diff --git a/client/src/main/resources/shader/gui/vertex.glsl b/client/src/main/resources/shader/gui/vertex.glsl new file mode 100644 index 0000000..925a07a --- /dev/null +++ b/client/src/main/resources/shader/gui/vertex.glsl @@ -0,0 +1,14 @@ +#version 460 core + +in vec2 position; +out vec2 texturePosition; + +uniform mat4 transform; + +void main() { + gl_Position = transform * vec4(position, 0.0, 1.0); + texturePosition = vec2( + (position.x + 1.0) / 2.0, + 1 - (position.y + 1.0) / 2.0 + ); +} \ No newline at end of file diff --git a/core/src/main/java/nl/andrewl/aos_core/ImageUtils.java b/core/src/main/java/nl/andrewl/aos_core/ImageUtils.java new file mode 100644 index 0000000..31f6d34 --- /dev/null +++ b/core/src/main/java/nl/andrewl/aos_core/ImageUtils.java @@ -0,0 +1,28 @@ +package nl.andrewl.aos_core; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.nio.ByteBuffer; + +public class ImageUtils { + public static ByteBuffer decodePng(BufferedImage image) { + int width = image.getWidth(); + int height = image.getHeight(); + + // Load texture contents into a byte buffer + ByteBuffer buf = ByteBuffer.allocateDirect(4 * width * height ); + + // decode image + // ARGB format to -> RGBA + for( int h = 0; h < height; h++ ) + for( int w = 0; w < width; w++ ) { + int argb = image.getRGB( w, h ); + buf.put( (byte) ( 0xFF & ( argb >> 16 ) ) ); + buf.put( (byte) ( 0xFF & ( argb >> 8 ) ) ); + buf.put( (byte) ( 0xFF & ( argb ) ) ); + buf.put( (byte) ( 0xFF & ( argb >> 24 ) ) ); + } + buf.flip(); + return buf; + } +}