This commit is contained in:
Anuken
2021-06-06 11:05:36 -04:00
parent 8d12dbbe70
commit 782c7a9ff3
3 changed files with 16 additions and 28 deletions
@@ -322,7 +322,17 @@ public class HudFragment extends Fragment{
}
return max == 0f ? 0f : val / max;
}).blink(Color.white).outline(new Color(0, 0, 0, 0.6f), 7f)).grow())
.fillX().width(320f).height(60f).name("boss").visible(() -> state.rules.waves && state.boss() != null).padTop(7);
.fillX().width(320f).height(60f).name("boss").visible(() -> state.rules.waves && state.boss() != null).padTop(7).row();
t.table(Styles.black3, p -> p.margin(4).label(() -> hudText).style(Styles.outlineLabel)).touchable(Touchable.disabled).with(p -> p.visible(() -> {
p.color.a = Mathf.lerpDelta(p.color.a, Mathf.num(showHudText), 0.2f);
if(state.isMenu()){
p.color.a = 0f;
showHudText = false;
}
return p.color.a >= 0.001f;
}));
});
//spawner warning
@@ -342,20 +352,6 @@ public class HudFragment extends Fragment{
t.add("@saving").style(Styles.outlineLabel);
});
parent.fill(p -> {
p.name = "hudtext";
p.top().table(Styles.black3, t -> t.margin(4).label(() -> hudText)
.style(Styles.outlineLabel)).padTop(10).visible(p.color.a >= 0.001f);
p.update(() -> {
p.color.a = Mathf.lerpDelta(p.color.a, Mathf.num(showHudText), 0.2f);
if(state.isMenu()){
p.color.a = 0f;
showHudText = false;
}
});
p.touchable = Touchable.disabled;
});
//TODO DEBUG: rate table
if(false)
parent.fill(t -> {
+3 -7
View File
@@ -1,15 +1,16 @@
sourceSets.main.java.srcDirs = ["src/"]
import arc.files.Fi
import arc.graphics.Color
import arc.graphics.Pixmap
import arc.packer.TexturePacker
import arc.struct.IntIntMap
import arc.struct.IntMap
import arc.util.async.Threads
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
def genFolder = "../core/assets-raw/sprites_out/generated/"
def doAntialias = !project.hasProperty("disableAntialias")
@@ -222,12 +223,7 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
}
}
executor.shutdown()
try{
executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS)
}catch(InterruptedException e){
e.printStackTrace()
}
Threads.await(executor)
println "Time taken for AA: ${(System.currentTimeMillis() - ms) / 1000f}"
+2 -6
View File
@@ -9,6 +9,7 @@ import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.async.*;
import arc.util.noise.*;
import mindustry.ctype.*;
import mindustry.game.*;
@@ -161,12 +162,7 @@ public class Generators{
});
}
try{
exec.shutdown();
exec.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
}catch(Exception e){
throw new RuntimeException("go away", e);
}
Threads.await(exec);
});
generate("cracks", () -> {