diff --git a/core/src/mindustry/graphics/Bloom.java b/core/src/mindustry/graphics/Bloom.java index a015c6eb9d..9f38d56b06 100644 --- a/core/src/mindustry/graphics/Bloom.java +++ b/core/src/mindustry/graphics/Bloom.java @@ -364,8 +364,8 @@ public class Bloom{ private static Mesh createFullScreenQuad(){ float[] verts = {-1, -1, 0, 0, 1, -1, 1, 0, 1, 1, 1, 1, -1, 1, 0, 1}; Mesh tmpMesh = new Mesh(true, 4, 0, - new VertexAttribute(Usage.Position, 2, "a_position"), - new VertexAttribute(Usage.TextureCoordinates, 2, "a_texCoord0") + new VertexAttribute(Usage.position, 2, "a_position"), + new VertexAttribute(Usage.textureCoordinates, 2, "a_texCoord0") ); tmpMesh.setVertices(verts); diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java index b21282c0ab..4e9ff4d45a 100644 --- a/core/src/mindustry/graphics/IndexedRenderer.java +++ b/core/src/mindustry/graphics/IndexedRenderer.java @@ -13,18 +13,18 @@ public class IndexedRenderer implements Disposable{ private Shader program = new Shader( Strings.join("\n", - "attribute vec4 " + Shader.POSITION_ATTRIBUTE + ";", - "attribute vec4 " + Shader.COLOR_ATTRIBUTE + ";", - "attribute vec2 " + Shader.TEXCOORD_ATTRIBUTE + "0;", + "attribute vec4 " + Shader.positionAttribute + ";", + "attribute vec4 " + Shader.colorAttribute + ";", + "attribute vec2 " + Shader.texcoordAttribute + "0;", "uniform mat4 u_projTrans;", "varying vec4 v_color;", "varying vec2 v_texCoords;", "", "void main(){", - " v_color = " + Shader.COLOR_ATTRIBUTE + ";", + " v_color = " + Shader.colorAttribute + ";", " v_color.a = v_color.a * (255.0/254.0);", - " v_texCoords = " + Shader.TEXCOORD_ATTRIBUTE + "0;", - " gl_Position = u_projTrans * " + Shader.POSITION_ATTRIBUTE + ";", + " v_texCoords = " + Shader.texcoordAttribute + "0;", + " gl_Position = u_projTrans * " + Shader.positionAttribute + ";", "}"), Strings.join("\n", "#ifdef GL_ES", @@ -222,9 +222,9 @@ public class IndexedRenderer implements Disposable{ if(mesh != null) mesh.dispose(); mesh = new Mesh(true, 6 * sprites, 0, - new VertexAttribute(Usage.Position, 2, "a_position"), - new VertexAttribute(Usage.ColorPacked, 4, "a_color"), - new VertexAttribute(Usage.TextureCoordinates, 2, "a_texCoord0")); + new VertexAttribute(Usage.position, 2, "a_position"), + new VertexAttribute(Usage.colorPacked, 4, "a_color"), + new VertexAttribute(Usage.textureCoordinates, 2, "a_texCoord0")); vertices = new float[6 * sprites * vsize]; mesh.setVertices(vertices); } diff --git a/gradle.properties b/gradle.properties index c9da6feacf..f8f06520c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=a85dbe44f7fb7aa66a28755931efee5e2e294a29 +archash=04a41e39be5445d58c94209ec370e355f85f28b1