+ * Draws an image from the specified path. + *
+ *+ * {@code setColor} and {@code getColor} don't do anything for this drawable as + * it is not a traditional solid color shape + *
+ * + *{@code
+ * // get the working directory of the program / where it is looking for your image
+ * System.out.println(System.getProperty("user.dir"));
+ * // create a new image object
+ * Image img = new Image(100, 100, "path/to/image.png");
+ * }
+ */
+public class Image extends Drawable{@code
+ * Image img = new Image(0, 0, "image.png");
+ * img.setScale(2.0, 1.0); // the image is now stretched in the x direction
+ * }
+ * @param x The multiplier to scale x by
+ * @param y The multiplier to scale y by
+ * @return The original object to allow method chaining
+ */
+ public Image setScale(double x, double y) {
+ this.width = (int)(image.getWidth() * x);
+ this.height = (int)(image.getHeight() * y);
+ return this;
+ }
+
+ @Override
+ protected void drawFilled(Graphics2D gc) {
+ gc.drawImage(image, x - width / 2, y - height / 2, width, height, null);
+ }
+
+ @Override
+ protected void drawOutline(Graphics2D gc) {
+ gc.drawRect(x - width / 2, y - height / 2, width, height);
+ }
+
+ @Override
+ protected Image getThis() {
+ return this;
+ }
+}
diff --git a/src/main/java/paintingcanvas/drawable/Rectangle.java b/src/main/java/paintingcanvas/drawable/Rectangle.java
index 7d07411..4a99a69 100644
--- a/src/main/java/paintingcanvas/drawable/Rectangle.java
+++ b/src/main/java/paintingcanvas/drawable/Rectangle.java
@@ -67,11 +67,6 @@ protected void drawFilled(Graphics2D gc) {
gc.fillRect(x - width / 2, y - height / 2, width, height);
}
- @Override
- public Point center(Graphics g) {
- return new Point(x, y);
- }
-
@Override
protected Rectangle getThis() {
return this;
diff --git a/src/main/java/paintingcanvas/drawable/Square.java b/src/main/java/paintingcanvas/drawable/Square.java
index a7d2a1c..494f74b 100644
--- a/src/main/java/paintingcanvas/drawable/Square.java
+++ b/src/main/java/paintingcanvas/drawable/Square.java
@@ -58,11 +58,6 @@ protected void drawOutline(Graphics2D gc) {
gc.drawRect(x - size / 2, y - size / 2, size, size);
}
- @Override
- public Point center(Graphics g) {
- return new Point(x, y);
- }
-
@Override
public Square getThis() {
return this;
diff --git a/src/main/java/paintingcanvas/drawable/Triangle.java b/src/main/java/paintingcanvas/drawable/Triangle.java
index 618ec10..aca7cc5 100644
--- a/src/main/java/paintingcanvas/drawable/Triangle.java
+++ b/src/main/java/paintingcanvas/drawable/Triangle.java
@@ -120,11 +120,6 @@ protected void drawOutline(Graphics2D gc) {
gc.drawPolygon(this.getPolygon());
}
- @Override
- public Point center(Graphics g) {
- return new Point(x, y);
- }
-
@Override
protected Triangle getThis() {
return this;
diff --git a/src/test/java/examples/Test.java b/src/test/java/examples/Test.java
index e1e25d6..da05776 100644
--- a/src/test/java/examples/Test.java
+++ b/src/test/java/examples/Test.java
@@ -1,12 +1,14 @@
package examples;
import paintingcanvas.canvas.Canvas;
+import paintingcanvas.drawable.Image;
import paintingcanvas.drawable.Line;
import paintingcanvas.drawable.Polygon;
import paintingcanvas.extensions.FrameCounter;
import paintingcanvas.extensions.InfoDisplay;
-import java.awt.*;
+import java.awt.Color;
+
@SuppressWarnings("unused")
public class Test {
@@ -16,26 +18,11 @@ static Color randomColor() {
public static void main(String[] args) {
Canvas canvas = new Canvas();
- new FrameCounter().line(
- () -> String.format("Animations: %d", canvas.animations.size())
- ).attach();
- new InfoDisplay().attach();
- Line l = new Line(0, 0, 100, 100, Color.RED).setColor(Color.blue);
- Polygon[] shapes = new Polygon[10];
- for (int i = 0; i < shapes.length; i++) {
- shapes[i] = new Polygon(0, 200, randomColor());
- for (int j = 0; j < 5; j++) {
- int x = (int) (Math.random() * 200);
- int y = (int) (Math.random() * 200);
- shapes[i].point(x, y);
- }
- }
- while (true) {
- for (int i = 0; i < 20; i++) {
- for (Polygon c : shapes) c.move(10, 0);
- for (Polygon c : shapes) c.move(-10, 0);
- }
- }
+ String dir = System.getProperty("user.dir");
+ Image image = new Image(0, 0, "src/test/java/examples/flop.jpg")
+ .rotate(90);
+
+ while(true) {}
}
}
diff --git a/src/test/java/examples/flop.jpg b/src/test/java/examples/flop.jpg
new file mode 100644
index 0000000..6d8d8d7
Binary files /dev/null and b/src/test/java/examples/flop.jpg differ
diff --git a/todo.md b/todo.md
deleted file mode 100644
index beab6c5..0000000
--- a/todo.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# ToDo
-
- - [ ] Clean up documentation
- - [ ] Rewrite wiki documentation (yaaay)
- - [x] Resize thingy
- - [ ] Make it based on real time (?????)
- - [ ] remove `TimeUnit`?
- - [ ] `setThickness` `setOutline` shenanigans
\ No newline at end of file