diff --git a/src/main/java/shape/App.java b/src/main/java/shape/App.java index ebeb608d4ed947314c8778214441cd9f2ad01546..eadfa08114c3456676417851976935546dbee895 100644 --- a/src/main/java/shape/App.java +++ b/src/main/java/shape/App.java @@ -9,10 +9,10 @@ import javafx.scene.canvas.GraphicsContext; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.stage.Stage; - import java.util.Arrays; + public class App extends Application { public static void main(String[] args) { @@ -22,22 +22,28 @@ public class App extends Application { @Override public void start(Stage primaryStage) { Group root = new Group(); - Canvas canvas = new Canvas(400, 400); + Canvas canvas = new Canvas(130, 110); GraphicsContext graphicsContext = canvas.getGraphicsContext2D(); ShapeContainer shapeContainer = new ShapeContainer(); graphicsContext.setFill(Color.AQUAMARINE); - graphicsContext.fillRect(0, 0, canvas.getWidth(), canvas.getHeight()); + graphicsContext.fillOval(10,10,10,10); + + shapeContainer.addShape(new Rectangle(Color.BLUE,new Point2D(10,10), new Point2D(40,40))); + + // Créer un polygone (triangle) Polygon triangle = new Polygon(Color.RED, Arrays.asList( - new Point2D(100, 50), - new Point2D(150, 150), - new Point2D(50, 150) + new Point2D(100, 50), // Point 1 + new Point2D(150, 150), // Point 2 + new Point2D(50, 150) // Point 3 + )); - graphicsContext.fillOval(10,10,10,10); - shapeContainer.addShape(new Rectangle(Color.BLUE,new Point2D(10,10), new Point2D(40,40))); + // Ajouter le polygone au conteneur et le dessiner + shapeContainer.addShape(triangle); + shapeContainer.draw(graphicsContext); root.getChildren().add(canvas); primaryStage.setScene(new Scene(root));