Merge branch 'master' of ssh://gitlab.insa-rennes.fr:16022/francesco-bariatti/RushPascal

Conflicts:
	src/model/Board.java

src/controller/GameController.java

 package controller;
 
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 
+import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
-
 import java.net.URL;
+import java.util.Iterator;
+import java.util.Random;
 import java.util.ResourceBundle;
 
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import model.Board;
 
 public class GameController implements Initializable {
@@ -24,7 +27,7 @@ public class GameController implements Initializable {
         private GridPane board;
 
         @FXML
-        private Label levelNumber;
+        private Label labelLevelNumber;
 
 
     /*  ----- ATTRIBUTES -----  */
@@ -32,27 +35,78 @@ public class GameController implements Initializable {
         /**
          *
          */
-        private static final String LEVEL_FILE = "data/level";
+        private static final String LEVEL_FILENAME = "data/level";
 
         /**
-         * The model of the controller.
+         *
+         */
+        private static final int HOW_MANY_LEVELS = 1;
+
+        /**
+         *
          */
         private Board model;
 
+        /**
+         *
+         */
+        private Color[] colors;
+
+        /**
+         *
+         */
+        private IntegerProperty levelNumber;
+
+        public GameController() {
+            levelNumber = new SimpleIntegerProperty();
+        }
+
+        public void nextLevel() {
+            levelNumber.set(levelNumber.get() + 1);
+            try {
+                model = new Board(LEVEL_FILENAME + levelNumber.get() + ".txt");
+            } catch (IOException e) {
+                System.out.println(LEVEL_FILENAME + levelNumber.get() + ".txt not found");
+            }
+        }
+
+        private void initColors() {
+            colors = new Color[model.getCarsNumber()];
+            colors[0] = Color.RED;
+
+            for (int i = 1; i < colors.length; i++) {
+                Random random = new Random();
+                colors[i] = Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256));
+            }
+        }
+
+        private void initBoard() {
+            for (int i = 0; i < model.getSize(); i++)
+                for (int j = 0; j < model.getSize(); j++)
+                    setCaseColor(i, j, model.getValue(i, j));
+        }
+
+        private void setCaseColor(int i, int j, int value) {
+            Iterator<Node> itr = board.getChildren().iterator();
+            for (int k = 0; k < i * model.getSize() + j; k++)
+                itr.next();
+
+            ((Rectangle) itr.next()).setFill(colors[value]);
+        }
 
         @Override
         public void initialize(URL location, ResourceBundle resources) {
-            board.setGridLinesVisible(true);
+            nextLevel();
 
+            Rectangle cell;
             double size = 300.0 / model.getSize();
-            Pane cell;
-            boolean tmp = true;
             for (int i = 0; i < model.getSize(); i++)
-                for (int j = 0; j < model.getSize(); j++) {
-                    cell = new Pane();
-                    cell.setPrefSize(size, size);
-                    board.add(cell, i, j);
-                }
+                for (int j = 0; j < model.getSize(); j++)
+                    board.add(new Rectangle(size, size), i, j);
+
+            labelLevelNumber.textProperty().bind(levelNumber.asString());
+            initColors();
+            initBoard();
         }
 
-}
+}
\ No newline at end of file

src/model/Board.java

@@ -60,7 +60,7 @@ public class Board {
 
 			Car car = new Car(i, pos1, pos2, Car.Orientation.valueOf(splitl[4]));
 			cars[i] = car;
-			
+
 			if(car.getOrientation() == Car.Orientation.HORIZONTAL)
 				for(int x = car.getBack().getX(); x <= car.getFront().getX(); x++)
 					board[x][car.getFront().getY()] = car.getNumber();
@@ -100,7 +100,7 @@ public class Board {
 		}
 		return sb.toString();
 	}
-	
+
 	public int[][] getBoard()
 	{
 		return board;
@@ -110,7 +110,7 @@ public class Board {
 	{
 		this.board = board;
 	}
-	
+
 	public static void main(String[]args) throws IOException{
 		Board test = new Board("testlevel.txt");
 		System.out.println(test.toString());

src/view/Game.fxml

@@ -6,7 +6,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 
-
 <BorderPane xmlns:fx="http://javafx.com/fxml" fx:controller="controller.GameController" stylesheets="style.css">
 	<center>
 		<GridPane fx:id="board" alignment="CENTER">
@@ -18,7 +17,7 @@
 	<bottom>
 		<HBox alignment="CENTER">
 			<Label text="Level : " />
-			<Label fx:id="levelNumber" />
+			<Label fx:id="labelLevelNumber" />
 			<padding>
 				<Insets bottom="10.0" />
 			</padding>