This commit is contained in:
sharlottes
2022-04-13 21:08:53 +09:00
parent 53e0b9d3f2
commit 00918c2a04
2 changed files with 11 additions and 10 deletions

View File

@@ -4,6 +4,7 @@ import UnitInfo.shaders.*;
import UnitInfo.ui.*; import UnitInfo.ui.*;
import UnitInfo.ui.windows.*; import UnitInfo.ui.windows.*;
import arc.*; import arc.*;
import arc.scene.ui.Dialog;
import arc.struct.Seq; import arc.struct.Seq;
import mindustry.*; import mindustry.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
@@ -18,10 +19,8 @@ import static mindustry.Vars.ui;
public class Main extends Mod { public class Main extends Mod {
@Override @Override
public void init(){ public void init(){
if(!mobile) { turretRange = new RangeShader();
turretRange = new RangeShader(); lineShader = new LineShader();
lineShader = new LineShader();
}
Core.app.post(() -> { Core.app.post(() -> {
Mods.ModMeta meta = Vars.mods.locateMod("unitinfo").meta; Mods.ModMeta meta = Vars.mods.locateMod("unitinfo").meta;
@@ -52,12 +51,14 @@ public class Main extends Mod {
scene.add(new ElementDisplay()); scene.add(new ElementDisplay());
Seq.with( for(Dialog dialog : new Dialog[]{
ui.picker, ui.editor, ui.controls, ui.restart, ui.join, ui.discord, ui.picker, ui.editor, ui.controls, ui.restart, ui.join, ui.discord,
ui.load, ui.custom, ui.language, ui.database, ui.settings, ui.host, ui.load, ui.custom, ui.language, ui.database, ui.settings, ui.host,
ui.paused, ui.about, ui.bans, ui.admins, ui.traces, ui.maps, ui.content, ui.paused, ui.about, ui.bans, ui.admins, ui.traces, ui.maps, ui.content,
ui.planet, ui.research, ui.mods, ui.schematics, ui.logic ui.planet, ui.research, ui.mods, ui.schematics, ui.logic}) {
).forEach(dialog-> dialog.add(new ElementDisplay(dialog))); dialog.add(new ElementDisplay(dialog));
}
}); });
Events.on(WorldLoadEvent.class, e -> { Events.on(WorldLoadEvent.class, e -> {

View File

@@ -57,7 +57,7 @@ public class OverDrawer {
Events.run(EventType.Trigger.draw, () -> { Events.run(EventType.Trigger.draw, () -> {
effectBuffer.resize(graphics.getWidth(), graphics.getHeight()); effectBuffer.resize(graphics.getWidth(), graphics.getHeight());
if(!mobile) Draw.drawRange(158, 1f, () -> effectBuffer.begin(Color.clear), () -> { Draw.drawRange(158, 1f, () -> effectBuffer.begin(Color.clear), () -> {
effectBuffer.end(); effectBuffer.end();
effectBuffer.blit(lineShader); effectBuffer.blit(lineShader);
}); });
@@ -285,14 +285,14 @@ public class OverDrawer {
})); }));
} }
tmpbuildobj.each((t, bseq) -> { tmpbuildobj.each((t, bseq) -> {
if(!mobile&&settings.getBool("RangeShader")) Draw.drawRange(166+t.id*3, 1, () -> effectBuffer.begin(Color.clear), () -> { if(settings.getBool("RangeShader")) Draw.drawRange(166+t.id*3, 1, () -> effectBuffer.begin(Color.clear), () -> {
effectBuffer.end(); effectBuffer.end();
effectBuffer.blit(turretRange); effectBuffer.blit(turretRange);
}); });
Draw.color(t.color); Draw.color(t.color);
bseq.each(b -> { bseq.each(b -> {
float range = ((BaseTurret.BaseTurretBuild)b).range(); float range = ((BaseTurret.BaseTurretBuild)b).range();
if(!mobile&&settings.getBool("RangeShader")) { if(settings.getBool("RangeShader")) {
Draw.z(166+t.id*3); Draw.z(166+t.id*3);
Fill.poly(b.x, b.y, Lines.circleVertices(range), range); Fill.poly(b.x, b.y, Lines.circleVertices(range), range);
} }