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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/type/Planet.java
This commit is contained in:
Anuken
2021-09-04 23:29:02 -04:00
parent 393d3a19a3 89d495fdb1
commit e958cce816
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,22 +156,11 @@ public class PlanetRenderer implements Disposable{
}
if(cam.frustum.containsSphere(planet.position, planet.clipRadius) && planet.parent != null && planet.hasAtmosphere && Core.settings.getBool("atmosphere")){
Gl.depthMask(false);
Blending.additive.apply();
Shaders.atmosphere.camera = cam;
Shaders.atmosphere.planet = planet;
Shaders.atmosphere.bind();
Shaders.atmosphere.apply();
atmosphere.render(Shaders.atmosphere, Gl.triangles);
Blending.normal.apply();
Gl.depthMask(true);
planet.drawAtmosphere(atmosphere, cam);
}
planet.drawClouds(cam.combined, planet.getTransform(mat));
for(Planet child : planet.children){
renderTransparent(child);
}