emh/helium
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

texturing works

Browse Source
This commit is contained in:
EvilMuffinHa
2020-05-25 14:59:42 -04:00
parent 5fc63b6c73
commit 2294aba9e3
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/hl/engine/graphics/Vertex.java
+2 -1
View File
@@ -10,9 +10,10 @@ public class Vertex {
private Vector3f color;
private Vector2f textureCoords;
public Vertex (Vector3f position, Vector3f color, Vector2f texture) {
public Vertex (Vector3f position, Vector3f color, Vector2f textureCoords) {
this.position = position;
this.color = color;
this.textureCoords = textureCoords;
}
public Vector3f getPosition() {
src/org/hl/engine/io/Display.java
+5 -1
View File
@@ -1,5 +1,6 @@
package org.hl.engine.io;
import org.hl.engine.math.lalg.Vector3f;
import org.lwjgl.glfw.GLFWErrorCallback;
import org.lwjgl.glfw.GLFWVidMode;
import org.lwjgl.glfw.GLFWWindowSizeCallback;
import org.lwjgl.opengl.GL;
@@ -96,6 +97,8 @@ public class Display {
// Creates the window (should go in the init() function of your Main program)
public void create() throws Exception {
GLFWErrorCallback.createPrint(System.err).set();
// initializing glfw
if (!glfwInit()) {
//System.err.println("Failed to initialize GLFW! ");
@@ -104,7 +107,7 @@ public class Display {
}
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL11.GL_TRUE);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
@@ -190,6 +193,7 @@ public class Display {
// Completely DESTROYS the window
public void destroy() {
resizeCallback.free();
glfwSetErrorCallback(null).free();
glfwDestroyWindow(window);
glfwTerminate();
}