From ec653752713f292193f1869bbc876db58371ba47 Mon Sep 17 00:00:00 2001 From: okseby Date: Wed, 31 May 2023 13:54:39 -0400 Subject: [PATCH] Fix small inconsistencies. --- {textures => res/textures}/grassblock.png | Bin src/main/java/com/okseby/core/ObjectLoader.java | 1 + src/main/java/com/okseby/core/entity/Texture.java | 1 - src/main/java/com/okseby/core/test/TestGame.java | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {textures => res/textures}/grassblock.png (100%) diff --git a/textures/grassblock.png b/res/textures/grassblock.png similarity index 100% rename from textures/grassblock.png rename to res/textures/grassblock.png diff --git a/src/main/java/com/okseby/core/ObjectLoader.java b/src/main/java/com/okseby/core/ObjectLoader.java index 327c43c..079e849 100644 --- a/src/main/java/com/okseby/core/ObjectLoader.java +++ b/src/main/java/com/okseby/core/ObjectLoader.java @@ -50,6 +50,7 @@ public class ObjectLoader { int id = GL11.glGenTextures(); textures.add(id); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, id); GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, width, height, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, buffer); diff --git a/src/main/java/com/okseby/core/entity/Texture.java b/src/main/java/com/okseby/core/entity/Texture.java index f81ef9e..3fc6c68 100644 --- a/src/main/java/com/okseby/core/entity/Texture.java +++ b/src/main/java/com/okseby/core/entity/Texture.java @@ -3,7 +3,6 @@ package com.okseby.core.entity; import lombok.Getter; public class Texture { - @Getter private final int id; public Texture(int id) { diff --git a/src/main/java/com/okseby/core/test/TestGame.java b/src/main/java/com/okseby/core/test/TestGame.java index 28b56c8..7a3a6bf 100644 --- a/src/main/java/com/okseby/core/test/TestGame.java +++ b/src/main/java/com/okseby/core/test/TestGame.java @@ -46,7 +46,7 @@ public class TestGame implements ILogic { }; model = loader.loadModel(vertices, textureCoordinates, indices); - model.setTexture(new Texture(loader.loadTexture("textures/grassblock.png"))); + model.setTexture(new Texture(loader.loadTexture("res/textures/grassblock.png"))); } @Override