mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-05 07:47:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-29 23:06:58 -04:00
parent fc65812263
commit 115e3a737b
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import arc.util.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.game.EventType.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.graphics.g3d.*; import mindustry.graphics.g3d.*;
@ -43,12 +44,7 @@ public class PlanetDialog extends FloatingDialog{
private final Mat3D mat = new Mat3D(); private final Mat3D mat = new Mat3D();
private final Vec3 camRelative = new Vec3(); private final Vec3 camRelative = new Vec3();
private final Bloom bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false, true){{ private Bloom bloom;
setClearColor(0, 0, 0, 0);
setThreshold(0.8f);
blurPasses = 6;
}};
private Planet planet = Planets.starter; private Planet planet = Planets.starter;
private float lastX, lastY; private float lastX, lastY;
private @Nullable Sector selected, hovered; private @Nullable Sector selected, hovered;
@ -66,12 +62,30 @@ public class PlanetDialog extends FloatingDialog{
}, 2, false, 1.5f, 0f); }, 2, false, 1.5f, 0f);
//seed: 8kmfuix03fw //seed: 8kmfuix03fw
private CubemapMesh skybox; private CubemapMesh skybox = new CubemapMesh(new Cubemap("cubemaps/stars/"));
public PlanetDialog(){ public PlanetDialog(){
super("", Styles.fullDialog); super("", Styles.fullDialog);
skybox = new CubemapMesh(new Cubemap("cubemaps/stars/")); makeBloom();
Events.on(DisposeEvent.class, () -> {
skybox.dispose();
batch.dispose();
projector.dispose();
atmosphere.dispose();
for(Mesh m : outlines){
if(m != null){
m.dispose();
}
}
});
Events.on(ResizeEvent.class, e -> {
makeBloom();
});
cam.fov = 60f;
addCloseButton(); addCloseButton();
buttons.addImageTextButton("$techtree", Icon.tree, () -> ui.tech.show()).size(230f, 64f); buttons.addImageTextButton("$techtree", Icon.tree, () -> ui.tech.show()).size(230f, 64f);
@ -126,6 +140,19 @@ public class PlanetDialog extends FloatingDialog{
shown(this::setup); shown(this::setup);
} }
void makeBloom(){
if(bloom != null){
bloom.dispose();
bloom = null;
}
bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false, true){{
setClearColor(0, 0, 0, 0);
setThreshold(0.8f);
blurPasses = 6;
}};
}
void setup(){ void setup(){
cont.clear(); cont.clear();
titleTable.remove(); titleTable.remove();

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=be91508b5491f1697c4996ef93bfad2d0243f147 archash=463da29cdf7fb64526c06852a10c750a2dbc48d3