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

Correct logic control position rendering

Browse Source
This commit is contained in:
Anuken
2020-10-11 14:10:55 -04:00
parent 7df575e76a
commit f1ec26f82b
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/graphics/OverlayRenderer.java
View File

@@ -7,6 +7,7 @@ import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.ai.types.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.input.*; import mindustry.input.*;
import mindustry.ui.*; import mindustry.ui.*;
@@ -151,6 +152,14 @@ public class OverlayRenderer{
input.drawOverSelect(); input.drawOverSelect();
if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build){
Draw.z(Layer.overlayUI);
Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
if(!unit.within(build, unit.hitSize * 2f)){
Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f);
}
}
//draw selection overlay when dropping item //draw selection overlay when dropping item
if(input.isDroppingItem()){ if(input.isDroppingItem()){
Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY()); Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());

16
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@@ -1,7 +1,6 @@
package mindustry.world.blocks.logic; package mindustry.world.blocks.logic;
import arc.func.*; import arc.func.*;
import arc.graphics.g2d.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.Bits; import arc.struct.Bits;
@@ -9,7 +8,6 @@ import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.*; import mindustry.*;
import mindustry.ai.types.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.io.*; import mindustry.io.*;
@@ -425,7 +423,6 @@ public class LogicBlock extends Block{
@Override @Override
public void buildConfiguration(Table table){ public void buildConfiguration(Table table){
table.button(Icon.pencil, Styles.clearTransi, () -> { table.button(Icon.pencil, Styles.clearTransi, () -> {
Vars.ui.logic.show(code, code -> { Vars.ui.logic.show(code, code -> {
configure(compress(code, relativeConnections())); configure(compress(code, relativeConnections()));
@@ -433,19 +430,6 @@ public class LogicBlock extends Block{
}).size(40); }).size(40);
} }
@Override
public void draw(){
super.draw();
if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller == this){
Draw.z(Layer.overlayUI);
Drawf.square(x, y, size * tilesize/2f + 2f);
if(!unit.within(this, unit.hitSize * 2f)){
Drawf.arrow(unit.x, unit.y, x, y, unit.hitSize *2f, 4f);
}
}
}
@Override @Override
public boolean onConfigureTileTapped(Building other){ public boolean onConfigureTileTapped(Building other){
if(this == other){ if(this == other){