Resolving conflicts and applying textures

src/org/hl/engine/graphics/Vertex.java

@@ -1,24 +1,35 @@
 package org.hl.engine.graphics;
 
-import org.hl.engine.math.Vector3f;
+
+import org.hl.engine.math.lalg.*;
+
 
 public class Vertex {
 
-    // Just a vertex
+	// Just a vertex
 
-    private Vector3f position;
-    private Vector3f color;
+	private Vector3f position;
+	private Vector3f color;
+	private Vector2f textureCoords;
 
-    public Vertex (Vector3f position, Vector3f color) {
-        this.position = position;
-        this.color = color;
-    }
 
-    public Vector3f getPosition() {
-        return position;
-    }
+	public Vertex (Vector3f position, Vector3f color, Vector2f textureCoords) {
+		this.position = position;
+		this.color = color;
+		this.textureCoords = textureCoords;
+	}
+
+	public Vector3f getPosition() {
+		return position;
+	}
+
+
+	public Vector3f getColor() {
+		return color;
+	}
+
+	public Vector2f getTextureCoords() {
+		return textureCoords;
+	}
 
-    public Vector3f getColor() {
-        return color;
-    }
 }