From ce933acda60301f0ddf0663fa929862fb82d7a12 Mon Sep 17 00:00:00 2001
From: "Florian Richer (MrDev023)" <trexricher1997@gmail.com>
Date: Fri, 1 Jan 2016 22:01:55 +0100
Subject: [PATCH] Update Commit

---
 First Game Engine Project/res/font/Thumbs.db  | Bin 0 -> 4096 bytes
 .../src/mrdev023/opengl/DisplayManager.java   |   1 +
 .../src/mrdev023/opengl/VAO.java              |  89 ++++++++++++++++++
 .../src/mrdev023/opengl/gui/Button.java       |   5 +
 .../src/mrdev023/opengl/gui/GUIComponent.java |   5 +
 .../src/mrdev023/opengl/gui/Message.java      |   2 +-
 6 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 First Game Engine Project/res/font/Thumbs.db
 create mode 100644 First Game Engine Project/src/mrdev023/opengl/VAO.java
 create mode 100644 First Game Engine Project/src/mrdev023/opengl/gui/Button.java
 create mode 100644 First Game Engine Project/src/mrdev023/opengl/gui/GUIComponent.java

diff --git a/First Game Engine Project/res/font/Thumbs.db b/First Game Engine Project/res/font/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..17d31bd699c47b97650d3295463de411a8dd2113
GIT binary patch
literal 4096
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

literal 0
HcmV?d00001

diff --git a/First Game Engine Project/src/mrdev023/opengl/DisplayManager.java b/First Game Engine Project/src/mrdev023/opengl/DisplayManager.java
index 83eacda..b133733 100644
--- a/First Game Engine Project/src/mrdev023/opengl/DisplayManager.java	
+++ b/First Game Engine Project/src/mrdev023/opengl/DisplayManager.java	
@@ -6,6 +6,7 @@ import static org.lwjgl.opengl.GL11.*;
 public class DisplayManager {
 
 	public static void clear(){
+		glClearColor(1,1,1,1);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	}
 	
diff --git a/First Game Engine Project/src/mrdev023/opengl/VAO.java b/First Game Engine Project/src/mrdev023/opengl/VAO.java
new file mode 100644
index 0000000..4b696e7
--- /dev/null
+++ b/First Game Engine Project/src/mrdev023/opengl/VAO.java	
@@ -0,0 +1,89 @@
+package mrdev023.opengl;
+
+import static org.lwjgl.opengl.GL15.*;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL30.*;
+
+import java.nio.*;
+
+import org.lwjgl.*;
+
+
+public class VAO {
+
+	public int vao,vertexBuffer,colorBuffer,texBuffer;
+	
+	public VAO(){
+		vao = glGenVertexArrays();
+		vertexBuffer = glGenBuffers();
+		colorBuffer = glGenBuffers();
+		texBuffer = glGenBuffers();
+	}
+	
+	
+	public void setVertexBuffer(float... a){
+		FloatBuffer buffer = BufferUtils.createFloatBuffer(8);
+		for(float c : a)buffer.put(c);
+		buffer.flip();
+		
+		glBindVertexArray(vao);
+		glBindBuffer(GL_ARRAY_BUFFER,vertexBuffer);
+		glBufferData(GL_ARRAY_BUFFER,buffer,GL_STATIC_DRAW);
+		glBindBuffer(GL_ARRAY_BUFFER,0);
+		glBindVertexArray(0);
+	}
+	
+	public void setColorBuffer(float... a){
+		FloatBuffer buffer = BufferUtils.createFloatBuffer(16);
+		for(float c : a)buffer.put(c);
+		buffer.flip();
+		
+		glBindVertexArray(vao);
+		glBindBuffer(GL_ARRAY_BUFFER,colorBuffer);
+		glBufferData(GL_ARRAY_BUFFER,buffer,GL_STATIC_DRAW);
+		glBindBuffer(GL_ARRAY_BUFFER,0);
+		glBindVertexArray(0);
+	}
+	
+	public void setTexBuffer(float... a){
+		FloatBuffer buffer = BufferUtils.createFloatBuffer(8);
+		for(float c : a)buffer.put(c);
+		buffer.flip();
+		
+		glBindVertexArray(vao);
+		glBindBuffer(GL_ARRAY_BUFFER,texBuffer);
+		glBufferData(GL_ARRAY_BUFFER,buffer,GL_STATIC_DRAW);
+		glBindBuffer(GL_ARRAY_BUFFER,0);
+		glBindVertexArray(0);
+	}
+	
+	public void render(){
+		
+		glBindVertexArray(vao);
+		
+		glBindBuffer(GL_ARRAY_BUFFER,vertexBuffer);
+		glVertexPointer(2, GL_FLOAT, 8, 0);
+		
+		glBindBuffer(GL_ARRAY_BUFFER,colorBuffer);
+		glColorPointer(4,GL_FLOAT,16,0);
+		
+		glBindBuffer(GL_ARRAY_BUFFER,texBuffer);
+		glTexCoordPointer(2,GL_FLOAT,8,0);
+		
+		glDrawArrays(GL_QUADS,0,4);		
+		
+		glBindBuffer(GL_ARRAY_BUFFER,0);
+		
+		glBindVertexArray(0);
+		
+	}
+	
+	
+	public void destroy(){
+		glDeleteBuffers(vertexBuffer);
+		glDeleteBuffers(colorBuffer);
+		glDeleteBuffers(texBuffer);
+		glDeleteVertexArrays(vao);
+	}
+	
+}
diff --git a/First Game Engine Project/src/mrdev023/opengl/gui/Button.java b/First Game Engine Project/src/mrdev023/opengl/gui/Button.java
new file mode 100644
index 0000000..3bfb6b8
--- /dev/null
+++ b/First Game Engine Project/src/mrdev023/opengl/gui/Button.java	
@@ -0,0 +1,5 @@
+package mrdev023.opengl.gui;
+
+public class Button extends GUIComponent{
+
+}
diff --git a/First Game Engine Project/src/mrdev023/opengl/gui/GUIComponent.java b/First Game Engine Project/src/mrdev023/opengl/gui/GUIComponent.java
new file mode 100644
index 0000000..3890b39
--- /dev/null
+++ b/First Game Engine Project/src/mrdev023/opengl/gui/GUIComponent.java	
@@ -0,0 +1,5 @@
+package mrdev023.opengl.gui;
+
+public abstract class GUIComponent {
+
+}
diff --git a/First Game Engine Project/src/mrdev023/opengl/gui/Message.java b/First Game Engine Project/src/mrdev023/opengl/gui/Message.java
index c658620..4b285be 100644
--- a/First Game Engine Project/src/mrdev023/opengl/gui/Message.java	
+++ b/First Game Engine Project/src/mrdev023/opengl/gui/Message.java	
@@ -2,7 +2,7 @@ package mrdev023.opengl.gui;
 
 import mrdev023.opengl.*;
 
-public class Message {
+public class Message{
 
 	public static final int TIME_OUT = 5000;
 	private long current, previous, time = 0;