diff --git a/src/main/java/latice/application/LaticeApplicationWindow.java b/src/main/java/latice/application/LaticeApplicationWindow.java index c0b2b12..8d67f44 100644 --- a/src/main/java/latice/application/LaticeApplicationWindow.java +++ b/src/main/java/latice/application/LaticeApplicationWindow.java @@ -35,17 +35,30 @@ import latice.model.Tile; public class LaticeApplicationWindow extends Application{ + javafx.scene.paint.Color realColor = new javafx.scene.paint.Color(0, 0, 0, 0); + Image image = new Image("laticePlateau.png"); ImageView imageView = new ImageView(image); Tile blueBird = new Tile(Color.NAVYBLUE, Shape.BIRD); Tile greenLeaf = new Tile(Color.GREEN, Shape.FEATHER); Tile redFlower = new Tile(Color.RED, Shape.FLOWER); + + + + + + public static void main(String[] args) { Application.launch(args); } + + + + + @Override public void start(Stage primaryStage) throws Exception { @@ -81,21 +94,7 @@ public class LaticeApplicationWindow extends Application{ root.setCenter(pane); - //-------------------------------------------------------------------------------------- - //Deck - ArrayList listOfTile = new ArrayList(); - for (Color color : Color.values()) { - for (Shape shape : Shape.values()) { - Tile tile = new Tile(color, shape); - System.out.println(color.getStringColor() + shape.getStringShape()+ ".png"); - - listOfTile.add(tile); - - } - } - - Deck deck = new Deck(listOfTile); //-------------------------------------------------------------------------------------- diff --git a/src/main/java/latice/model/Rack.java b/src/main/java/latice/model/Rack.java index 39925a1..39f44a1 100644 --- a/src/main/java/latice/model/Rack.java +++ b/src/main/java/latice/model/Rack.java @@ -43,13 +43,6 @@ public class Rack { public void setListRackTile(ArrayList listRackTile) { this.listRackTile = listRackTile; } - - - - - public ArrayList getListRackTile() { - return listRackTile; - } @@ -66,7 +59,7 @@ public class Rack { tile = (this.getListRackTile()).get(index); - image = new Image(tile.getShape().getStringShape() + " " + tile.getColor().getStringColor()+ ".png"); + image = new Image(tile.getShape().getStringShape() + "_" + tile.getColor().getStringColor()+ ".png"); imageView = new ImageView(image); rack.getChildren().add(imageView);