mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 20:57:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix WaveGraph Lineup (#5503)

Browse Source
This commit is contained in:
Arik
2021-06-29 06:03:56 -07:00
committed by GitHub
parent cececa190a
commit 5c803594fb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/editor/WaveGraph.java
View File

@ -53,7 +53,7 @@ public class WaveGraph extends Table{
for(int i = 0; i < values.length; i++){ for(int i = 0; i < values.length; i++){
int val = values[i][type.id]; int val = values[i][type.id];
float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max; float cx = graphX + i*spacing, cy = graphY + val * graphH / max;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -69,7 +69,7 @@ public class WaveGraph extends Table{
sum += values[i][type.id]; sum += values[i][type.id];
} }
float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal; float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -84,7 +84,7 @@ public class WaveGraph extends Table{
sum += (type.health) * values[i][type.id]; sum += (type.health) * values[i][type.id];
} }
float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth; float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -92,29 +92,29 @@ public class WaveGraph extends Table{
} }
//how many numbers can fit here //how many numbers can fit here
float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2); float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2);
int markSpace = Math.max(1, Mathf.ceil(max / totalMarks)); int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
Draw.color(Color.lightGray); Draw.color(Color.lightGray);
for(int i = 0; i < max; i += markSpace){ for(int i = 0; i < max; i += markSpace){
float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX; float cy = graphY + i * graphH / max, cx = graphX;
//Lines.line(cx, cy, cx + len, cy); //Lines.line(cx, cy, cx + len, cy);
lay.setText(font, "" + i); lay.setText(font, "" + i);
font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right); font.draw("" + i, cx, cy + lay.height/2f, Align.right);
} }
float len = Scl.scl(4f); float len = Scl.scl(4f);
font.setColor(Color.lightGray); font.setColor(Color.lightGray);
for(int i = 0; i < values.length; i++){ for(int i = 0; i < values.length; i++){
float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX; float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
Lines.line(cx, cy, cx, cy + len); Lines.line(cx, cy, cx, cy + len);
if(i == values.length/2){ if(i == values.length/2){
font.draw("" + (i + from + 1), cx, cy - 2f, Align.center); font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
} }
} }
font.setColor(Color.white); font.setColor(Color.white);