Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arc

Browse Source
This commit is contained in:
Anuken
2020-06-25 12:54:55 -04:00
parent d90807b29c
commit ecfac00c30
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/shaders/water.frag
View File

@@ -13,7 +13,7 @@ const float mth = 7.0;
void main(){ 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 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); vec2 coords = vec2(c.x / v.x + u_campos.x, c.y / v.y + u_campos.y);

4
core/src/mindustry/ClientLauncher.java
View File

@@ -36,8 +36,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
loader = new LoadRenderer(); loader = new LoadRenderer();
Events.fire(new ClientCreateEvent()); Events.fire(new ClientCreateEvent());
Vars.loadFileLogger(); loadFileLogger();
Vars.platform = this; platform = this;
beginTime = Time.millis(); beginTime = Time.millis();
//debug GL information //debug GL information

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=58f60c5897faca754da3d930dcf4aed2ef9fe114 archash=34de6140d85680f13cc7dbb58eb42a7f1d2301ea