From 58879c4dcb5f925a8019448cda6ba3500ec3db9f Mon Sep 17 00:00:00 2001
From: Billy Gallagher <william.j.gallagher@uconn.edu>
Date: Mon, 18 Apr 2016 22:01:39 -0400
Subject: [PATCH] Basic tile rendering complete. Next up should be collision
 checking, but we'll see if I can focus on one thing for that long.

---
 res/rawImage/playerBlue.xcf                   | Bin 0 -> 1487 bytes
 res/rawImage/playerGreen.xcf                  | Bin 0 -> 1373 bytes
 res/rawImage/playerRed.xcf                    | Bin 0 -> 1373 bytes
 res/rawImage/smoothFloor.xcf                  | Bin 0 -> 2067 bytes
 res/rawImage/stoneWall.xcf                    | Bin 0 -> 1389 bytes
 res/{ => sprites}/playerBlue.png              | Bin
 res/{ => sprites}/playerGreen.png             | Bin
 res/{ => sprites}/playerRed.png               | Bin
 .../stoneFloor.png}                           | Bin
 res/sprites/stoneWall.png                     | Bin 0 -> 223 bytes
 shaders/{smoothFloor.frag => tile.frag}       |   1 -
 shaders/{smoothFloor.vert => tile.vert}       |   7 +-
 src/game/Main.java                            |   8 +-
 src/game/Options.java                         |   6 +-
 src/game/entity/Entity.java                   |  22 ++++
 src/game/entity/Player.java                   |  34 +++--
 src/game/graphics/Shader.java                 |   4 +-
 src/game/level/Level.java                     | 119 +++++++++++++-----
 src/game/level/tiles/SmoothFloor.java         |  26 ----
 src/game/level/tiles/StoneFloor.java          |  21 ++++
 src/game/level/tiles/StoneWall.java           |  22 ++++
 src/game/level/tiles/Tile.java                |  41 ++++--
 22 files changed, 207 insertions(+), 104 deletions(-)
 create mode 100644 res/rawImage/playerBlue.xcf
 create mode 100644 res/rawImage/playerGreen.xcf
 create mode 100644 res/rawImage/playerRed.xcf
 create mode 100644 res/rawImage/smoothFloor.xcf
 create mode 100644 res/rawImage/stoneWall.xcf
 rename res/{ => sprites}/playerBlue.png (100%)
 rename res/{ => sprites}/playerGreen.png (100%)
 rename res/{ => sprites}/playerRed.png (100%)
 rename res/{smoothFloor.png => sprites/stoneFloor.png} (100%)
 create mode 100644 res/sprites/stoneWall.png
 rename shaders/{smoothFloor.frag => tile.frag} (88%)
 rename shaders/{smoothFloor.vert => tile.vert} (50%)
 create mode 100644 src/game/entity/Entity.java
 delete mode 100644 src/game/level/tiles/SmoothFloor.java
 create mode 100644 src/game/level/tiles/StoneFloor.java
 create mode 100644 src/game/level/tiles/StoneWall.java

diff --git a/res/rawImage/playerBlue.xcf b/res/rawImage/playerBlue.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..53c0e868800799df43c668519e77b63002db3e81
GIT binary patch
literal 1487
zcmd^7+iu!G5FJp!#$4+Xi=ZG@jS@hK6KI-7c|)nHst=X=3j~Z~m79R5;VGZcen3B=
zKh&S`^b9PPtI~(|wJROZ@yyQdoMZdJc%~lvLp2OW9$|Gggg*lk2|S(y=Iz(LZvyZ#
zum>aoM|0V?kNs~E^FEGs`_u8*n=J88QncU9z24FrsL#RjUcGz&;iFVa>#f1K=X<U{
z4+fHx-C=XFT#Y=nn2v%$%W4k&{&X~*tL8embN{ZV+UM={+Ce(H)I#gsj@E5m{h3JX
z<6_q92NOTqhTLjLPN&?5Nw8GGq<`-%q<cCXF1%$lo;3fS+GKuh6&LhMeBUy}u7)^N
zoQ--bZ+<&^@XluwADQ*{keCMK`!HZ?E-e|&5$G_+tr*Y7crM2CF<u0hbGOR?k^5xD
z|BX$ClAko`A_}lK`GhE|yFv1cygbnl&Xddg)Zha;;u<NgQ;m<P%EwgU207fKGM|#o
zE|vI#ia>!ol;cav0v2CU1~B=Wj2O~<L#cm2I(CMfXX^7UeP0fD7xWw@%w%J>GG=rz
zYXvh`F?$Uf6to;cQv=#uXcVRYnc5PGVhU}}!l*F8Hirp1q0nN7LyKNeXmFK7gX&a=
zUC1lRAJ8#ZV4OoOF4HO7Ft8-mGpQEnf(z8)oOHLP+oDUhr2bOsCS9>9x4n|v(sa#+
zMp{OB&7qC|@rF}>g>7dlcAgR4V&Kk9G(iUQWTWY_m{n#jMhc41V?$RN`W)!2KyOv5
YYxRflLPgHNBkdM^(+-|(EER8m0t2gudjJ3c

literal 0
HcmV?d00001

diff --git a/res/rawImage/playerGreen.xcf b/res/rawImage/playerGreen.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..35746b175710ee2fec3e780364a3aec8f04a6bfe
GIT binary patch
literal 1373
zcmd^7U2fVy5FSusjQMjZAV5W|gd#wZlb|Sy@)o74sy<Ze6^Jp8Rf7>YYIx!Z?E!j(
zUMQF8^c#1bIx2n1Ye)LLpJ!)gznNV>Sgh28J6H1{^aysXA^a7P%i;4HFmJvcd>4Q>
zfCG(|UL~%H_;*+<KFT_7v{-n{82==j^|xzp8hbPKC5Z3T`wt&K$&Q_b28*fhIsQ7B
ziBF<`jyCZ&^wcH_gW1>`&3!itqqQ0(i?jA`r|RtFEU`UgqPNCKz1@?V?yG+jNqyL?
zrf#tGpTgkV?(u1tbH5B?6)fF5ZzI{!e7^DGCwY?mx9hj(d8$l7Tkc27uwHA(glemB
zy7ksK;k|dVTKe!%UOq4bko#f4)Lc@Enq#3i8E$2GDZ|SdUdiwpxYSLp03zp!rEeqE
z0$2WXvhzniV)MJ_zWi7D-_avi$l)dpxkCf)k>Wn}ctBk~qBaky#bavlG1b{2n@_0*
zRCz*WKBp33@dXtDlP{@|fx%aF_yQQ28dA^H^(}o~8E03u4jY>4(AI#)7PPjZxeM(*
z^q|no06h)Sn}Z&u)16KHpLI-+RKb**m`*2|jG}%rnJyi18`Ejgm>YD=bxg^oQ?3D3
znsAxUxdd2r!9~ENOD<$!&=nuP07j;U)H8K`OP^Q9*;TE>hNe2SHK4Htt!-%TCa<*5
QDtV<H^wmUv6}eaX1@@dw-2eap

literal 0
HcmV?d00001

diff --git a/res/rawImage/playerRed.xcf b/res/rawImage/playerRed.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..a65a496ee7ac7cfd1d3e54d6d306756726647a6c
GIT binary patch
literal 1373
zcmd^7QEu8m5FKa&#u#uZAV5W|gd#wZlb|Sy@)xD5s(w`J6&x^*Rf7>YYWU&^?E!j(
zUZ|Jp^o_et9hLs%w<A68^X$y*o7we)#Y#O)=V~5=9>K0PgueuGIecCL#?9A*ZvyZJ
zZ~(jjTAE8-6Y+1cR(zCorqN>IEo1zXY}VhbJva7d>T?j^sdw)`e3TtK2@Mvm?>YWD
zn2ArKe~vcsHuTgc3WM3$9L@b{6h><`N)~7B-@5AT<Sem0WTLmmNWI;Yn(nKA6G?s8
ztlVj^^dH0E+wSpcmvg@iVihc>ciu*_qxpQ}#gFnN`ES>6&(l<yg0|fElwrNrkO|dR
zp}Y0gH{rc^vReA^P+mT;0wDLpfT6jhlr+aeuQS}t@N$M*8D7co8o1O=tq3CLiKTBN
z)dE-kQ?m0%K4SB`r@s6b`QO>ZJNm&Da=1xD?$CgHq_|H#9#EH$sLexa@t7KXOm%k1
z=2NNxRi2Q==TrtvzMv9d@Ff*9DDV{>J_ChJ4XJ17`lde5!r4`=!-l3hv^Aiy1+8sp
z?m~MHJt*`tKu<&T=AcLE^uOztDwt3clj$T=QPfYS(xoGAV=^robAyh#jtSXx$~B-$
z6SnA_%YaE2TmlTb<YEQ|y5hrUppdB{^$cC#)aO|^yQ+2A&{T)E1~j&ywGGYP<c0QG
QB`>stzMAN-BKJza05(ue+yDRo

literal 0
HcmV?d00001

diff --git a/res/rawImage/smoothFloor.xcf b/res/rawImage/smoothFloor.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..5ae722127d548ee79ac652c47d0a8fdb413eb909
GIT binary patch
literal 2067
zcmeHHy-ve05O!JwrKRGZse{LK2r4^6RfG@&60eXtwri2ZRpN?P43!WY3oGxyGXi(P
zE~yAF5cQ-l_xZa!=i;*>RWhY>Ca6#`CtyPh<c9#ygU2zTHF_fi0d@k|0$c*lEXTZ4
z$iD{Pm9TBVbdvDYz?xw2=qlr(;SqgQW<qan@9r^jP^79Plsu4`icrJsPd_({nA2Rx
zD(bg=A(@VKM*YGCnH-07a6Txkf?U{8A4<m+r7lkYCs;bqry*0RT&01wsL-qw%u;2j
zO4)?xSgnP~xmmS`#ebzAWxW(n!J7Bs82F(DN}W;29%QCxX>n)`)WEg@IGZm(%W^!>
zUCY6dUWvC$yi?+PCEhLZec-sSvmGG#J~VePTrVIsWD)soy$RaWy4HBb^^!b`-n$2A
d*4!`2OU=K~O%P|gnQQ%S^k%O0{8QmvzX3J$^;ZA@

literal 0
HcmV?d00001

diff --git a/res/rawImage/stoneWall.xcf b/res/rawImage/stoneWall.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..dd49e4e1493ecfdc49925d6f0e19859b2986ee17
GIT binary patch
literal 1389
zcmeHFyH3L}6m?PrrKRG{#NaU<g38QN6(Pic#4osx<60zfmAIl60}?9>EC0YZ0{0rH
zxFUQ(Inv2JKKEY7FRAh=o%58YDiZ`SbVR)m3<CHZ0^6fkLXdzX;D+Ogi&%FI^;Zyk
z5~hv0&T~;17!yn$T$X|vk<bTaCiME|_6{?9wp8UziddE^K@Y1xqRK2XK`Wi9q~D2B
z$#ten8rcw+a?I%9Y+%tK&Rwbxt>cE)I#2%=*gCJKjH^N}%fMSSc+QGvg)&qXd?G6B
z)@fP^vs@lF|F*uJ)mA(Ohv2<d5QmOvbw`Zf%Tmt@duSngfK4FY%_p$!G#==-(-6q1
zr#qhRdV0sxJx}j~#(8UOfx!PE>UUAE1*}lo%+JzW;61K-;R}wR$TPWkYpoG+$N#%t
Jk2}YE{sJcr1g!u7

literal 0
HcmV?d00001

diff --git a/res/playerBlue.png b/res/sprites/playerBlue.png
similarity index 100%
rename from res/playerBlue.png
rename to res/sprites/playerBlue.png
diff --git a/res/playerGreen.png b/res/sprites/playerGreen.png
similarity index 100%
rename from res/playerGreen.png
rename to res/sprites/playerGreen.png
diff --git a/res/playerRed.png b/res/sprites/playerRed.png
similarity index 100%
rename from res/playerRed.png
rename to res/sprites/playerRed.png
diff --git a/res/smoothFloor.png b/res/sprites/stoneFloor.png
similarity index 100%
rename from res/smoothFloor.png
rename to res/sprites/stoneFloor.png
diff --git a/res/sprites/stoneWall.png b/res/sprites/stoneWall.png
new file mode 100644
index 0000000000000000000000000000000000000000..afa852c4a1c92cce823f3ed9fcf2ff7049def1de
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLGH$&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=fJK;5Kzhy1I7y(8WQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyua
zq^FBxNXEUl7dP@UDDW^l9^N!l^LCH{OV^J4JI|)L<VTn9s=o6wbZUzKf1qk&K||dO
YhVw4W6@4#0-v;UNboFyt=akR{06X+G`v3p{

literal 0
HcmV?d00001

diff --git a/shaders/smoothFloor.frag b/shaders/tile.frag
similarity index 88%
rename from shaders/smoothFloor.frag
rename to shaders/tile.frag
index 6001a40..caed726 100644
--- a/shaders/smoothFloor.frag
+++ b/shaders/tile.frag
@@ -8,7 +8,6 @@ in DATA
 	vec3 position;
 } fs_in;
 
-uniform vec2 player;
 uniform sampler2D tex;
 
 void main()
diff --git a/shaders/smoothFloor.vert b/shaders/tile.vert
similarity index 50%
rename from shaders/smoothFloor.vert
rename to shaders/tile.vert
index c651c30..ba2a611 100644
--- a/shaders/smoothFloor.vert
+++ b/shaders/tile.vert
@@ -4,7 +4,8 @@ layout (location = 0) in vec4 position;
 layout (location = 1) in vec2 tc;
 
 uniform mat4 pr_matrix;
-uniform mat4 vw_matrix;
+uniform mat4 vw_matrix = mat4(1.0);
+uniform mat4 ml_matrix = mat4(1.0);
 
 out DATA
 {
@@ -14,7 +15,7 @@ out DATA
 
 void main()
 {
-	gl_Position = pr_matrix * vw_matrix * position;
+	gl_Position = pr_matrix * vw_matrix * ml_matrix * position;
 	vs_out.tc = tc;
-	vs_out.position = vec3(vw_matrix * position);
+	vs_out.position = vec3(vw_matrix * ml_matrix * position);
 }
\ No newline at end of file
diff --git a/src/game/Main.java b/src/game/Main.java
index c79e01b..c5e18be 100644
--- a/src/game/Main.java
+++ b/src/game/Main.java
@@ -16,8 +16,8 @@ import game.math.Matrix4f;
 
 public class Main implements Runnable {
 	
-	private int width = 1280;
-	private int height = 720;
+	private int width = 1920;
+	private int height = 1080;
 	private boolean running = false;
 	private Thread gameThread;
 	private long gameWindow;
@@ -64,8 +64,8 @@ public class Main implements Runnable {
 		
 		// Set all shader uniform variables here
 		Matrix4f projectionMatrix = Matrix4f.orthographic(-10.0f, 10.0f, -10.0f * 9.0f / 16.0f, 10.0f * 9.0f / 16.0f, -1.0f, 1.0f);
-		Shader.SMOOTH_FLOOR.setUniformMat4f("pr_matrix", projectionMatrix);
-		Shader.SMOOTH_FLOOR.setUniform1i("tex", 1);
+		Shader.TILE.setUniformMat4f("pr_matrix", projectionMatrix);
+		Shader.TILE.setUniform1i("tex", 1);
 		
 		Shader.PLAYER.setUniformMat4f("pr_matrix", projectionMatrix);
 		Shader.PLAYER.setUniform1i("tex", 1);
diff --git a/src/game/Options.java b/src/game/Options.java
index c74e0da..7050b24 100644
--- a/src/game/Options.java
+++ b/src/game/Options.java
@@ -8,9 +8,9 @@ public class Options {
 	private static int chosenBallColor = 0;
 	
 	private static Texture[] ballColors = new Texture[] {
-			new Texture("res/playerBlue.png"),
-			new Texture("res/playerRed.png"),
-			new Texture("res/playerGreen.png"),
+			new Texture("res/sprites/playerBlue.png"),
+			new Texture("res/sprites/playerRed.png"),
+			new Texture("res/sprites/playerGreen.png"),
 	};
 	
 	public Options() {
diff --git a/src/game/entity/Entity.java b/src/game/entity/Entity.java
new file mode 100644
index 0000000..b18b2ca
--- /dev/null
+++ b/src/game/entity/Entity.java
@@ -0,0 +1,22 @@
+package game.entity;
+
+import game.graphics.Texture;
+import game.graphics.VertexArray;
+import game.math.Vector3f;
+
+public abstract class Entity {
+	
+	protected float SIZE;
+	protected Vector3f position = new Vector3f();
+	protected float speed;
+	
+	protected VertexArray mesh;
+	protected Texture texture;
+	protected float[] vertices;
+	protected byte[] indices;
+	protected float[] tcs;
+	
+	public abstract void update();
+	public abstract void render();
+	
+}
diff --git a/src/game/entity/Player.java b/src/game/entity/Player.java
index a4eb802..8a45c4b 100644
--- a/src/game/entity/Player.java
+++ b/src/game/entity/Player.java
@@ -4,36 +4,33 @@ import org.lwjgl.glfw.GLFW;
 
 import game.Options;
 import game.graphics.Shader;
-import game.graphics.Texture;
 import game.graphics.VertexArray;
 import game.input.Input;
 import game.math.Matrix4f;
-import game.math.Vector3f;
 
-public class Player {
-	
-	private float SIZE = 1.0f;
-	private VertexArray mesh;
-	private Texture texture;
-	
-	private Vector3f position = new Vector3f();
+public class Player extends Entity{
 	
 	private int playerKeyUp, playerKeyDown, playerKeyLeft, playerKeyRight;	
 	
-	public Player() {
-		float[] vertices = new float[] {
+	public Player(float x, float y) {
+		SIZE = 0.5f;
+		position.x = x;
+		position.y = y;
+		speed = .05f;
+		
+		vertices = new float[] {
 			-SIZE / 2.0f, -SIZE / 2.0f, 0.2f,
 			-SIZE / 2.0f,  SIZE / 2.0f, 0.2f,
 			 SIZE / 2.0f,  SIZE / 2.0f, 0.2f,
 			 SIZE / 2.0f, -SIZE / 2.0f, 0.2f,
 		};
 		
-		byte[] indices = new byte[] {
+		indices = new byte[] {
 			0, 1, 2,
 			2, 3, 0
 		};
 		
-		float[] tcs = new float[] {
+		tcs = new float[] {
 			0, 1,
 			0, 0,
 			1, 0,
@@ -42,6 +39,7 @@ public class Player {
 		
 		mesh = new VertexArray(vertices, indices, tcs);
 
+		// Just for testing at the moment
 		setColor();
 		
 		if (Options.isWASD) {
@@ -59,20 +57,18 @@ public class Player {
 	
 	public void update() {
 		if (Input.keys[playerKeyUp]) {
-			position.y += 0.1f;
+			position.y += speed;
 		}
 		if (Input.keys[playerKeyDown]) {
-			position.y -= 0.1f;
+			position.y -= speed;
 		}
 		if (Input.keys[playerKeyLeft]) {
-			position.x -= 0.1f;
+			position.x -= speed;
 		}
 		if (Input.keys[playerKeyRight]) {
-			position.x += 0.1f;
+			position.x += speed;
 		}
 		
-//		System.out.println("At (" + position.x + ", " + position.y + ")");
-		
 		// Just for testing, change color by pressing corresponding number buttons
 		if (Input.keys[GLFW.GLFW_KEY_0]) {
 			Options.setBallColor(0);
diff --git a/src/game/graphics/Shader.java b/src/game/graphics/Shader.java
index 11d1fed..101c387 100644
--- a/src/game/graphics/Shader.java
+++ b/src/game/graphics/Shader.java
@@ -15,7 +15,7 @@ public class Shader {
 	public static final int VERTEX_ATTRIB = 0;
 	public static final int TCOORD_ATTRIB = 1;
 	
-	public static Shader SMOOTH_FLOOR, PLAYER;
+	public static Shader TILE, PLAYER;
 	
 	private boolean enabled = false;
 	
@@ -27,7 +27,7 @@ public class Shader {
 	}
 	
 	public static void loadAll() {
-		SMOOTH_FLOOR = new Shader("shaders/smoothFloor.vert", "shaders/smoothFloor.frag");
+		TILE = new Shader("shaders/tile.vert", "shaders/tile.frag");
 		PLAYER = new Shader("shaders/player.vert", "shaders/player.frag");
 	}
 	
diff --git a/src/game/level/Level.java b/src/game/level/Level.java
index 232d7a3..ce9c37a 100644
--- a/src/game/level/Level.java
+++ b/src/game/level/Level.java
@@ -1,53 +1,104 @@
 package game.level;
 
+import game.entity.Entity;
 import game.entity.Player;
-import game.graphics.Shader;
-import game.graphics.Texture;
-import game.graphics.VertexArray;
+import game.level.tiles.*;
+import game.level.tiles.Tile;
 
 public class Level {
-	// number of tiles
-//	private int width, height;
 	
 	private Player player;
+	private int currentLevel;
+	private int width, height; // Number of tiles
+	private Tile[][] tiles;
+	private Entity[] entities;
+	private float originX, originY; // Where the 'origin' of the level is the lower left of the floor area
 	
 	public Level() {
-		float[] vertices = new float[] {
-			-10.0f, -10.0f * 9.0f / 16.0f, 0.0f,
-			-10.0f,  10.0f * 9.0f / 16.0f, 0.0f,
-			  0.0f,  10.0f * 9.0f / 16.0f, 0.0f,
-			  0.0f, -10.0f * 9.0f / 16.0f, 0.0f,
-		};
+		currentLevel = -1;
+		loadLevel();
+	}
+	
+	private void loadLevel() {
 		
-		byte[] indices = new byte[] {
-			0, 1, 2,
-			2, 3, 0
-		};
+		// This is a test level
+		if (currentLevel == -1) {
+			width = 7;
+			height = 7;
+			tiles = new Tile[width][height];
 			
-		float[] tcs = new float[] {
-			0, 1,
-			0, 0,
-			1, 0,
-			1, 1
-		};
-		
-		player = new Player();
-		
+			// Tile coordinates are double entity coordinates, i.e. the entity at (1, 1) is on the tile at (2, 2)
+			originX = -1.5f;
+			originY = -1.5f;
+			
+			// Load entities and positions, load into array
+			player = new Player(0f, 0f);
+			entities = new Entity[1];
+			entities[0] = player;
+			
+			// Load tiles. Sample, 5 x 5 grid of StoneFloor surrounded by StoneWalls
+			Tile.create();
+			for (int y = 0; y < width; y++) {
+				for (int x = 0; x < height; x++) {
+					float convertX = x/2f; // Tile coordinates are double entity coordinates
+					float convertY = y/2f;
+					if (y == 0 || y == height - 1 || x == 0 || x == width - 1) {
+						tiles[x][y] = new StoneWall(convertX + originX, convertY + originY);
+					} else {
+						tiles[x][y] = new StoneFloor(convertX + originX, convertY + originY);
+					}
+				}
+			}
+		}
 	}
 	
 	public void update() {
-		// tile update
-		// player update
-		// enemy update
-		
-		player.update();
+		updateTiles();
+		updateEntities();
 	}
 	
 	public void render() {
-		// render tiles
-		// render player
-		// render other entities
-				
-		player.render();
+		renderTiles();
+		renderEntities();
+	}
+	
+	private void updateTiles() {
+		for (Tile[] tileRow : tiles) {
+			for (Tile tile : tileRow) {
+				tile.update();
+			}
+		}
+	}
+	
+	private void updateEntities() {
+		for (Entity entity : entities) {
+			entity.update();
+		}
+	}
+	
+	private void renderTiles() {
+		for (Tile[] tileRow : tiles) {
+			for (Tile tile : tileRow) {
+				tile.render();
+			}
+		}
+	}
+	
+	private void renderEntities() {
+		for (Entity entity : entities) {
+			entity.render();
+		}
+	}
+	
+	private void handleCollisions() {
+		playerWallCollisions();
+		// Player-entity collisions
+		// Entity-wall collisions
+	}
+	
+	private void playerWallCollisions() {
+		boolean collided = false;
+		
+		// Check for collisions, flip flag, move player
 	}
 }
diff --git a/src/game/level/tiles/SmoothFloor.java b/src/game/level/tiles/SmoothFloor.java
deleted file mode 100644
index a00fb01..0000000
--- a/src/game/level/tiles/SmoothFloor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package game.level.tiles;
-
-import game.graphics.Texture;
-import game.graphics.VertexArray;
-
-public class SmoothFloor extends Tile{
-	
-	public SmoothFloor() {
-		super();
-		texture = new Texture("/res/SmoothFloor.png");
-	}
-
-	@Override
-	public void render() {
-		// TODO Auto-generated method stub
-		texture.bind();
-		
-	}
-
-	@Override
-	public void update() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-}
diff --git a/src/game/level/tiles/StoneFloor.java b/src/game/level/tiles/StoneFloor.java
new file mode 100644
index 0000000..0df5489
--- /dev/null
+++ b/src/game/level/tiles/StoneFloor.java
@@ -0,0 +1,21 @@
+package game.level.tiles;
+
+import game.graphics.Texture;
+import game.math.Matrix4f;
+
+public class StoneFloor extends Tile{
+	
+	public StoneFloor(float x, float y) {
+		position.x = x;
+		position.y = y;
+		texture = new Texture("res/sprites/stoneFloor.png");
+		ml_matrix = Matrix4f.translate(position);
+		isWall = false;
+	}
+
+	@Override
+	public void update() {
+		return;
+	}
+	
+}
diff --git a/src/game/level/tiles/StoneWall.java b/src/game/level/tiles/StoneWall.java
new file mode 100644
index 0000000..86e1e92
--- /dev/null
+++ b/src/game/level/tiles/StoneWall.java
@@ -0,0 +1,22 @@
+package game.level.tiles;
+
+import game.graphics.Texture;
+import game.math.Matrix4f;
+
+public class StoneWall extends Tile	{
+
+	public StoneWall(float x, float y) {
+		position.x = x;
+		position.y = y;
+		texture = new Texture("res/sprites/stoneWall.png");
+		ml_matrix = Matrix4f.translate(position);
+		isWall = true;
+	}
+
+	@Override
+	public void update() {
+		return;
+	}
+
+
+}
diff --git a/src/game/level/tiles/Tile.java b/src/game/level/tiles/Tile.java
index 6c54f7d..e1ba4f4 100644
--- a/src/game/level/tiles/Tile.java
+++ b/src/game/level/tiles/Tile.java
@@ -1,24 +1,30 @@
 package game.level.tiles;
 
+import game.graphics.Shader;
 import game.graphics.Texture;
 import game.graphics.VertexArray;
+import game.math.Matrix4f;
+import game.math.Vector3f;
 
 public abstract class Tile {
 
-	protected final float SIZE = 1.0f;
+	protected Vector3f position = new Vector3f();
+	protected boolean isWall;
+	protected static final float SIZE = 1.0f;
+	
 	protected Texture texture;
-	protected VertexArray vertexArray;
-	protected float[] vertices;
-	protected byte[] indices;
-	protected float[] tcs;
-
+	protected Matrix4f ml_matrix;
+	protected static VertexArray mesh;
+	private static float[] vertices;
+	private static float[] tcs;
+	private static byte[] indices;
 	
-	protected Tile() {
+	public static void create() {
 		vertices = new float[] {
-				-SIZE / 2.0f, -SIZE / 2.0f, 0.0f,
-				-SIZE / 2.0f,  SIZE / 2.0f, 0.0f,
-				 SIZE / 2.0f,  SIZE / 2.0f, 0.0f,
-				 SIZE / 2.0f, -SIZE / 2.0f, 0.0f,
+				-SIZE / 2.0f, -SIZE / 2.0f, 0.1f,
+				-SIZE / 2.0f,  SIZE / 2.0f, 0.1f,
+				 SIZE / 2.0f,  SIZE / 2.0f, 0.1f,
+				 SIZE / 2.0f, -SIZE / 2.0f, 0.1f,
 		};
 		
 		indices = new byte[] {
@@ -33,10 +39,21 @@ public abstract class Tile {
 				1, 1
 		};
 		
+		mesh = new VertexArray(vertices, indices, tcs);
+	}
+	
+	public void render() {
+		Shader.TILE.enable();
+		Shader.TILE.setUniformMat4f("vw_matrix", Matrix4f.translate(position));
+		texture.bind();
+		mesh.bind();
+		Shader.TILE.setUniformMat4f("ml_matrix", ml_matrix);
+		mesh.draw();
+		texture.unbind();
+		mesh.unbind();
 	}
 	
 	public abstract void update();
 	
-	public abstract void render();
 	
 }