Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-11 03:31:19 +03:00
Code Issues Projects Releases Wiki Activity

Tech tree zoom

Browse Source
This commit is contained in:
Anuken 2019-10-13 14:49:19 -04:00
parent 3d624f7eaf
commit 53c842492a
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@ -2,7 +2,6 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.*;
import io.anuke.arc.collection.*;
import io.anuke.arc.collection.ObjectSet.*;
import io.anuke.arc.function.*;
import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.g2d.*;

50
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@ -4,6 +4,7 @@ import io.anuke.arc.*;
import io.anuke.arc.collection.*;
import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.input.*;
import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
import io.anuke.arc.scene.*;
@ -134,7 +135,7 @@ public class TechTreeDialog extends FloatingDialog{
}
class View extends Group{
float panX = 0, panY = -200;
float panX = 0, panY = -200, lastZoom = -1;
boolean moved = false;
ImageButton hoverNode;
Table infoTable = new Table();
@ -205,12 +206,47 @@ public class TechTreeDialog extends FloatingDialog{
});
}
dragged((x, y) -> {
TechTreeDialog.this.dragged((x, y) -> {
moved = true;
panX += x;
panY += y;
panX += x / getScaleX();
panY += y / getScaleY();
clamp();
});
addListener(new InputListener(){
@Override
public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){
setScale(Mathf.clamp(getScaleX() - amountY / 100f, 0.2f, 1f));
setOrigin(Align.center);
setTransform(true);
return true;
}
@Override
public boolean mouseMoved(InputEvent event, float x, float y){
requestScroll();
return super.mouseMoved(event, x, y);
}
});
addListener(new ElementGestureListener(){
@Override
public void zoom(InputEvent event, float initialDistance, float distance){
if(lastZoom < 0){
lastZoom = getScaleX();
}
setScale(Mathf.clamp(distance / initialDistance * lastZoom, 0.2f, 1f));
}
@Override
public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
lastZoom = getScaleX();
}
});
setOrigin(Align.center);
setTransform(true);
}
void clamp(){
@ -308,9 +344,9 @@ public class TechTreeDialog extends FloatingDialog{
}
@Override
public void draw(){
public void drawChildren(){
clamp();
float offsetX = panX + width / 2f + x, offsetY = panY + height / 2f + y;
float offsetX = panX + width / 2f, offsetY = panY + height / 2f;
for(TechTreeNode node : nodes){
if(!node.visible) continue;
@ -324,7 +360,7 @@ public class TechTreeDialog extends FloatingDialog{
}
Draw.reset();
super.draw();
super.drawChildren();
}
}
}