merge

2017-01-21 01:53:51 +01:00 · 2017-01-21 01:53:51 +01:00 · 58e0435cb8
commit 58e0435cb8
parent e2347fe0f1 5d218a3a79
11 changed files with 461 additions and 404 deletions
--- a/src/globalgamejam/tiles/Tile.java
+++ b/src/globalgamejam/tiles/Tile.java
@ -33,10 +33,10 @@ public abstract class Tile {
        this.color = Color4f.WHITE;
        this.vbo = GL15.glGenBuffers();
        float[] a = new float[]{
-                -.5f,-.5f,        0.0f,0.0f,
-                .5f,-.5f,         1.0f,0.0f,
-                .5f,.5f,          1.0f,1.0f,
-                -.5f,.5f,         0.0f,1.0f
+                -.5f,-.5f,        0.0f,1.0f,
+                .5f,-.5f,         1.0f,1.0f,
+                .5f,.5f,          1.0f,0.0f,
+                -.5f,.5f,         0.0f,0.0f
        };
        FloatBuffer buffer = BufferUtils.createFloatBuffer(a.length);
        buffer.put(a).flip();