Oshgnacknak/AuD-2021-H07-Gruphi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scale and translate + round instead of floor

Browse Source
This commit is contained in:
Oshgnacknak
2021-07-01 23:34:44 +02:00
parent 465921081b
commit c26c37cc82
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/de/oshgnacknak/gruphi/Canvas.java
View File

@ -30,17 +30,24 @@ public class Canvas extends JPanel {
@Override
public void rect(double x, double y, double w, double h) {
g.fillRect((int) x, (int) y, (int) w, (int) h);
g.fillRect(round(x), round(y), round(w), round(h));
}
@Override
public void ellipse(double x, double y, double w, double h) {
g.fillOval((int) (x - w/2), (int) (y - h/2), (int) w, (int) h);
g.fillOval(round(x - w/2), round(y - h/2), round(w), round(h));
}
@Override
public void triangle(double x1, double y1, double x2, double y2, double x3, double y3) {
int[] xs = {round(x1), round(x2), round(x3)};
int[] ys = {round(y1), round(y2), round(y3)};
g.fillPolygon(xs, ys, 3);
}
@Override
public void line(double x1, double y1, double x2, double y2) {
g.drawLine((int) x1, (int) y1, (int) x2, (int) y2);
g.drawLine(round(x1), round(y1), round(x2), round(y2));
}
@Override
@ -51,11 +58,22 @@ public class Canvas extends JPanel {
}
@Override
public void triangle(double x1, double y1, double x2, double y2, double x3, double y3) {
int[] xs = {(int) x1, (int) x2, (int) x3};
int[] ys = {(int) y1, (int) y2, (int) y3};
g.fillPolygon(xs, ys, 3);
public void translated(double x, double y, Runnable r) {
g.translate(x, y);
r.run();
g.translate(-x, -y);
}
@Override
public void scaled(double scale, Runnable r) {
g.scale(scale, scale);
r.run();
g.scale(1/scale, 1/scale);
}
});
}
private int round(double d) {
return (int) Math.round(d);
}
}

6
src/main/java/de/oshgnacknak/gruphi/Drawable.java
View File

@ -12,9 +12,13 @@ public interface Drawable {
void ellipse(double x, double y, double w, double h);
void triangle(double x1, double y1, double x2, double y2, double x3, double y3);
void line(double x1, double y1, double x2, double y2);
void rotated(double theta, double x, double y, Runnable r);
void triangle(double x1, double y1, double x2, double y2, double x3, double y3);
void translated(double x, double y, Runnable r);
void scaled(double scale, Runnable r);
}