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

Planet progress

Browse Source
This commit is contained in:
Anuken
2021-06-11 11:31:21 -04:00
parent 31ebb1d156
commit 537c8f3cc5
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ public class Planets implements ContentList{
Simplex sim = new Simplex(id); Simplex sim = new Simplex(id);
@Override @Override
public float getHeight(Vec3 position){ 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 @Override

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

@@ -139,8 +139,6 @@ public class PlanetRenderer implements Disposable{
//render planet at offsetted position in the world //render planet at offsetted position in the world
planet.draw(cam.combined, planet.getTransform(mat)); planet.draw(cam.combined, planet.getTransform(mat));
renderOrbit(planet);
for(Planet child : planet.children){ for(Planet child : planet.children){
renderPlanet(child); renderPlanet(child);
} }
@@ -173,6 +171,8 @@ public class PlanetRenderer implements Disposable{
for(Planet child : planet.children){ for(Planet child : planet.children){
renderTransparent(child); renderTransparent(child);
} }
renderOrbit(planet);
} }
public void renderOrbit(Planet planet){ public void renderOrbit(Planet planet){

1
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -606,7 +606,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//autoshow //autoshow
if(wasNull){ if(wasNull){
Log.info("was null, updating selected");
updateSelected(); updateSelected();
} }
}else{ }else{

2
gradle.properties
View File

@@ -9,4 +9,4 @@ kapt.use.worker.api=true
kapt.include.compile.classpath=false 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 # 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 kotlin.stdlib.default.dependency=false
archash=dabe9d3e89a9ed1b1c4cb8496a4525dedf29f613 archash=ea70a34cc621c2c75d0aef5511c7f5aa4ced0d46