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

Cloud improvements

Browse Source
This commit is contained in:
Anuken
2021-09-05 10:15:32 -04:00
parent 9feedabf07
commit dedfd8efd3
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Planets.java
View File

@@ -84,8 +84,8 @@ public class Planets implements ContentList{
generator = new SerpuloPlanetGenerator(); generator = new SerpuloPlanetGenerator();
meshLoader = () -> new HexMesh(this, 6); meshLoader = () -> new HexMesh(this, 6);
cloudMeshLoader = () -> new MultiMesh( cloudMeshLoader = () -> new MultiMesh(
new HexSkyMesh(this, 0, 0.6f, 0.01f + 0.18f, 5, Color.white.cpy().lerp(Pal.spore, 0.75f).a(0.7f), 2, 0.5f, 1.1f, 0.42f), new HexSkyMesh(this, 11, 0.15f, 0.13f, 5, new Color().set(Pal.spore).mul(0.9f).a(0.75f), 2, 0.5f, 1f, 0.38f),
new HexSkyMesh(this, 10, 0.25f, 0.01f + 0.16f, 5, new Color().set(Pal.spore).mul(0.9f).a(0.7f), 2, 0.5f, 1f, 0.37f) new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.6f).a(0.75f), 2, 0.5f, 1.1f, 0.41f)
); );
atmosphereColor = Color.valueOf("3c1b8f"); atmosphereColor = Color.valueOf("3c1b8f");
atmosphereRadIn = 0.02f; atmosphereRadIn = 0.02f;

2
core/src/mindustry/graphics/g3d/HexSkyMesh.java
View File

@@ -38,7 +38,7 @@ public class HexSkyMesh extends PlanetMesh{
} }
public float relRot(){ public float relRot(){
return Time.globalTime * speed / 34f; return Time.globalTime * speed / 40f;
} }
@Override @Override

4
core/src/mindustry/graphics/g3d/PlanetRenderer.java
View File

@@ -151,6 +151,8 @@ public class PlanetRenderer implements Disposable{
public void renderTransparent(Planet planet){ public void renderTransparent(Planet planet){
if(!planet.visible()) return; if(!planet.visible()) return;
planet.drawClouds(cam.combined, planet.getTransform(mat));
if(planet.hasGrid() && planet == this.planet){ if(planet.hasGrid() && planet == this.planet){
renderSectors(planet); renderSectors(planet);
} }
@@ -159,8 +161,6 @@ public class PlanetRenderer implements Disposable{
planet.drawAtmosphere(atmosphere, cam); planet.drawAtmosphere(atmosphere, cam);
} }
planet.drawClouds(cam.combined, planet.getTransform(mat));
for(Planet child : planet.children){ for(Planet child : planet.children){
renderTransparent(child); renderTransparent(child);
} }

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash= archash=98c420de77661889ab0330a956d50721f27f33d9