diff --git a/pom.xml b/pom.xml index 6543384..0fb831a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ 22 UTF-8 3.3.4 - natives-windows @@ -23,6 +22,34 @@ + + + lwjgl-natives-linux-amd64 + + + unix + linux + amd64 + + + + natives-linux + + + + lwjgl-natives-windows-amd64 + + + windows + amd64 + + + + natives-windows + + + + @@ -36,8 +63,6 @@ - - org.lwjgl lwjgl @@ -162,10 +187,10 @@ org.lwjgl lwjgl-opus - - org.lwjgl - lwjgl-ovr - + + + + org.lwjgl lwjgl-par @@ -351,11 +376,11 @@ lwjgl-opus ${lwjgl.natives} - - org.lwjgl - lwjgl-ovr - ${lwjgl.natives} - + + + + + org.lwjgl lwjgl-par diff --git a/src/main/java/org/example/Entity.java b/src/main/java/org/example/Entity.java index 79c77aa..46653ba 100644 --- a/src/main/java/org/example/Entity.java +++ b/src/main/java/org/example/Entity.java @@ -35,10 +35,14 @@ public class Entity model.getTexCoords().size(), model.getObjects().size())); } catch (Exception e) { + System.out.println("ERROR Parsing obj"); e.printStackTrace(); System.exit(1); } + vaoId = 0; + vboId = 0; + // Load Shaders try { this.shader = new ShaderProgram(); @@ -48,7 +52,7 @@ public class Entity } try { - String vertex_shader_code = new Scanner(new File(vertex_shader_path)).useDelimiter("\\Z").next(); + String vertex_shader_code = new Scanner(this.getClass().getResourceAsStream(vertex_shader_path)).useDelimiter("\\Z").next(); this.shader.createVertexShader(vertex_shader_code); } catch (Exception e) { System.out.println("ERROR Initializing the vertex shader"); @@ -56,7 +60,7 @@ public class Entity } try { - String fragment_shader_code = new Scanner(new File(fragment_shader_path)).useDelimiter("\\Z").next(); + String fragment_shader_code = new Scanner(this.getClass().getResourceAsStream(fragment_shader_path)).useDelimiter("\\Z").next(); this.shader.createFragmentShader(fragment_shader_code); } catch (Exception e) { @@ -64,4 +68,12 @@ public class Entity e.printStackTrace(); } } + + public int getVaoId() { + return vaoId; + } + + public int getVboId() { + return vboId; + } } diff --git a/src/main/java/org/example/Game.java b/src/main/java/org/example/Game.java index b3380d7..9311836 100644 --- a/src/main/java/org/example/Game.java +++ b/src/main/java/org/example/Game.java @@ -100,7 +100,7 @@ public class Game glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Add stuff to world - world.addEntity(new Entity("/obs/cube.obj", "/shaders/shader.fraq", "/shaders/shader.vert")); + world.addEntity(new Entity("/objs/cube.obj", "/shaders/shader.frag", "/shaders/shader.vert")); // Main loop or something while ( !glfwWindowShouldClose(window) )