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

Display camera on map + right-click to pan

Browse Source
This commit is contained in:
Anuken
2023-04-15 14:39:41 -04:00
parent e8fbfe536e
commit 4ae8a51676
4 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/mindustry/ui/fragments/MinimapFragment.java
View File

@@ -5,9 +5,11 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.input.*;
import arc.math.*;
import arc.math.geom.*;
import arc.scene.*;
import arc.scene.event.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.gen.*;
import mindustry.input.*;
import mindustry.ui.*;
@@ -20,6 +22,16 @@ public class MinimapFragment{
private float baseSize = Scl.scl(5f);
public Element elem;
protected Rect getRectBounds(){
float
w = Core.graphics.getWidth(),
h = Core.graphics.getHeight(),
ratio = renderer.minimap.getTexture() == null ? 1f : (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width,
size = baseSize * zoom * world.width();
return Tmp.r1.set(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f * ratio, size, size * ratio);
}
public void build(Group parent){
elem = parent.fill((x, y, w, h) -> {
w = Core.graphics.getWidth();
@@ -35,7 +47,8 @@ public class MinimapFragment{
TextureRegion reg = Draw.wrap(renderer.minimap.getTexture());
Draw.rect(reg, w/2f + panx*zoom, h/2f + pany*zoom, size, size * ratio);
renderer.minimap.drawEntities(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f * ratio, size, size * ratio, zoom, true);
Rect bounds = getRectBounds();
renderer.minimap.drawEntities(bounds.x, bounds.y, bounds.width, bounds.height, zoom, true);
}
Draw.reset();
@@ -69,8 +82,14 @@ public class MinimapFragment{
@Override
public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){
panx += deltaX / zoom;
pany += deltaY / zoom;
if(event.keyCode != KeyCode.mouseRight){
panx += deltaX / zoom;
pany += deltaY / zoom;
}else{
Rect r = getRectBounds();
Tmp.v1.set(x, y).sub(r.x, r.y).scl(1f / r.width, 1f / r.height).scl(world.unitWidth(), world.unitHeight());
control.input.panCamera(Tmp.v1);
}
}
@Override