From 701165c0125adef7fa23267be26a20b97887d393 Mon Sep 17 00:00:00 2001 From: okseby Date: Wed, 31 May 2023 20:52:34 -0400 Subject: [PATCH] Consolidate all resources to the IntelliJ resources folder. --- src/main/java/com/okseby/core/ObjectLoader.java | 4 ++-- src/main/java/com/okseby/core/test/TestGame.java | 2 +- {res => src/main/resources}/textures/grassblock.jpg | Bin {res => src/main/resources}/textures/grassblock.png | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename {res => src/main/resources}/textures/grassblock.jpg (100%) rename {res => src/main/resources}/textures/grassblock.png (100%) diff --git a/src/main/java/com/okseby/core/ObjectLoader.java b/src/main/java/com/okseby/core/ObjectLoader.java index 080fca0..d111dc6 100644 --- a/src/main/java/com/okseby/core/ObjectLoader.java +++ b/src/main/java/com/okseby/core/ObjectLoader.java @@ -153,9 +153,9 @@ public class ObjectLoader { IntBuffer h = stack.mallocInt(1); IntBuffer c = stack.mallocInt(1); - buffer = STBImage.stbi_load(fileName, w, h, c, 4); + buffer = STBImage.stbi_load(ObjectLoader.class.getResource(fileName).getFile(), w, h, c, 4); if (buffer == null) - throw new Exception("Image File " + fileName + " not loaded " + STBImage.stbi_failure_reason()); + throw new Exception("Image File: '" + fileName + "' not loaded, error: " + STBImage.stbi_failure_reason()); width = w.get(); height = h.get(); diff --git a/src/main/java/com/okseby/core/test/TestGame.java b/src/main/java/com/okseby/core/test/TestGame.java index 98e87ce..dc8df29 100644 --- a/src/main/java/com/okseby/core/test/TestGame.java +++ b/src/main/java/com/okseby/core/test/TestGame.java @@ -33,7 +33,7 @@ public class TestGame implements ILogic { renderer.init(); Model model = loader.loadOBJModel("/models/cube.obj"); - model.setTexture(new Texture(loader.loadTexture("res/textures/grassblock.jpg"))); + model.setTexture(new Texture(loader.loadTexture("/textures/grassblock.jpg"))); entity = new Entity(model, new Vector3f(0, 0, -5), new Vector3f(0, 0, 0), 1); } diff --git a/res/textures/grassblock.jpg b/src/main/resources/textures/grassblock.jpg similarity index 100% rename from res/textures/grassblock.jpg rename to src/main/resources/textures/grassblock.jpg diff --git a/res/textures/grassblock.png b/src/main/resources/textures/grassblock.png similarity index 100% rename from res/textures/grassblock.png rename to src/main/resources/textures/grassblock.png