diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 80e2003819..ce71c8a849 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -89,7 +89,7 @@ public class Planets implements ContentList{ Simplex sim = new Simplex(id); @Override public float getHeight(Vec3 position){ - return (float)sim.octaveNoise3D(2, 0.6, 0.3f, position.x, position.y, position.z) * 13f; + return (float)sim.octaveNoise3D(2, 0.55, 0.45f, 5f + position.x, 5f + position.y, 5f + position.z) * 14f; } @Override diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 37dfe36d25..c6e5ac793f 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -139,8 +139,6 @@ public class PlanetRenderer implements Disposable{ //render planet at offsetted position in the world planet.draw(cam.combined, planet.getTransform(mat)); - renderOrbit(planet); - for(Planet child : planet.children){ renderPlanet(child); } @@ -173,6 +171,8 @@ public class PlanetRenderer implements Disposable{ for(Planet child : planet.children){ renderTransparent(child); } + + renderOrbit(planet); } public void renderOrbit(Planet planet){ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 0229a4d7a4..96be679973 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -606,7 +606,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ //autoshow if(wasNull){ - Log.info("was null, updating selected"); updateSelected(); } }else{ diff --git a/gradle.properties b/gradle.properties index daf6453a0a..5e1622bd4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ kapt.use.worker.api=true kapt.include.compile.classpath=false # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues kotlin.stdlib.default.dependency=false -archash=dabe9d3e89a9ed1b1c4cb8496a4525dedf29f613 +archash=ea70a34cc621c2c75d0aef5511c7f5aa4ced0d46