From 58a21c3cc7602456fa08f32dab42dd8e66e52cf8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Sep 2021 11:46:52 -0400 Subject: [PATCH] Arc compatibility --- core/assets/shaders/planet.vert | 2 +- core/src/mindustry/core/Renderer.java | 2 +- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 2 +- gradle.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/shaders/planet.vert b/core/assets/shaders/planet.vert index 1f3f85239f..f6721c2ef3 100755 --- a/core/assets/shaders/planet.vert +++ b/core/assets/shaders/planet.vert @@ -20,7 +20,7 @@ void main(){ vec3 lightReflect = normalize(reflect(a_normal, u_lightdir)); float specularFactor = dot(u_camdir, lightReflect); if(specularFactor > 0.0){ - specular = vec3(1.0 * pow(specularFactor, 32.0)) * (1.0-a_color.a); //specular power = 32 + specular = vec3(1.0 * pow(specularFactor, 64.0)) * (1.0-a_color.a); //specular power = 32 } vec3 norc = (u_ambientColor + specular) * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0))); diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index d4368ddf15..5ba0320cde 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -277,7 +277,7 @@ public class Renderer implements ApplicationListener{ } if(bloom != null){ - bloom.resize(graphics.getWidth() / 4, graphics.getHeight() / 4); + bloom.resize(graphics.getWidth(), graphics.getHeight()); Draw.draw(Layer.bullet - 0.02f, bloom::capture); Draw.draw(Layer.effect + 0.02f, bloom::render); } diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 68d8057bfe..2aef57b29a 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -124,7 +124,7 @@ public class PlanetRenderer implements Disposable{ } public void beginBloom(){ - bloom.resize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4); + bloom.resize(Core.graphics.getWidth(), Core.graphics.getHeight()); bloom.capture(); } diff --git a/gradle.properties b/gradle.properties index 340bf482cf..f3fc4af013 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=7a4fbbcaa8350c7d6e04a59f1eb50b04947c2280 +archash=e982971b17f48c13f3a18c344b8080b7498cccf6