diff --git a/core/assets/shaders/water.frag b/core/assets/shaders/water.frag index 18a4258852..f0c41ccd24 100644 --- a/core/assets/shaders/water.frag +++ b/core/assets/shaders/water.frag @@ -13,7 +13,7 @@ const float mth = 7.0; void main(){ - vec2 c = v_texCoords.xy; + vec2 c = v_texCoords; vec2 v = vec2(1.0/u_resolution.x, 1.0/u_resolution.y); vec2 coords = vec2(c.x / v.x + u_campos.x, c.y / v.y + u_campos.y); diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 461b5014c4..27be26e953 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -36,8 +36,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform loader = new LoadRenderer(); Events.fire(new ClientCreateEvent()); - Vars.loadFileLogger(); - Vars.platform = this; + loadFileLogger(); + platform = this; beginTime = Time.millis(); //debug GL information diff --git a/gradle.properties b/gradle.properties index cd915e7817..1fe4fd7e17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=58f60c5897faca754da3d930dcf4aed2ef9fe114 +archash=34de6140d85680f13cc7dbb58eb42a7f1d2301ea