Post merge fixes

js/controller.js

@@ -12,13 +12,12 @@ class Controller
 	initializeGame() {
 		let params = this.gatherMenuValues();
 		
-		this.game = new Game(params.TUBESNUMBERS, params.TUBESLEVELS);
-		this.drawer = new Drawer(params.PADDING, params.SCALE);
+		this.#game = new Game(params.TUBESNUMBERS, params.TUBESLEVELS);
+		this.#drawer = new Drawer(params.PADDING, params.SCALE);
 		
-		this.drawer.computeGameParams(params.TUBESNUMBERS, params.TUBESLEVELS);
-		this.width = 800
-		this.height = 600
-		this.ui = new UI(this.width, this.height);
+		this.#drawer.computeGameParams(params.TUBESNUMBERS, params.TUBESLEVELS);
+
+		this.ui = new UI(800, 600);
 		this.lastTime = 0;
 		
 		this.initializeColorTubes(params.TUBESLEVELS - 1);
@@ -43,7 +42,7 @@ class Controller
 	
 	initializeColorTubes(LayersPerTube)
 	{
-		let nbTubes = this.game.tubesNumber() - 1;
+		let nbTubes = this.#game.tubesNumber() - 1;
 		let allColors = [];
 		
 		for (let i = 0; i < nbTubes; i++)
@@ -59,7 +58,7 @@ class Controller
 			let randomIndex = Math.floor(Math.random() * (index + 1));
 			let tubeIndex = Math.floor(index / LayersPerTube);
 			
-			this.game.tubeAt(tubeIndex).addColorLayer(allColors[randomIndex]);
+			this.#game.tubeAt(tubeIndex).addColorLayer(allColors[randomIndex]);
 			
 			allColors[randomIndex] = allColors[index];
 		}
@@ -67,18 +66,18 @@ class Controller
 	
 	clickTube(tubeIndex)
 	{
-		let _clickedTube = this.game.tubeAt(tubeIndex);
+		let _clickedTube = this.#game.tubeAt(tubeIndex);
 		if (_clickedTube == null) return;
 		
-		if (_clickedTube == this.game.selectedTube())
-			this.game.unselectTube();
-		else if (this.canPourInto(this.game.selectedTube(), _clickedTube))
+		if (_clickedTube == this.#game.selectedTube())
+			this.#game.unselectTube();
+		else if (this.canPourInto(this.#game.selectedTube(), _clickedTube))
 		{
-			this.pourColorInto(this.game.selectedTube(), _clickedTube);
-			this.game.unselectTube();
+			this.pourColorInto(this.#game.selectedTube(), _clickedTube);
+			this.#game.unselectTube();
 		}
 		else if (!_clickedTube.isEmpty())
-			this.game.selectTubeAt(tubeIndex);
+			this.#game.selectTubeAt(tubeIndex);
 	}
 	
 	canPourInto(sourceTube, targetTube)
@@ -86,7 +85,7 @@ class Controller
 		return sourceTube != null && targetTube != null
 			&& sourceTube != targetTube
 			&& (targetTube.isEmpty() || sourceTube.peekTopColor() == targetTube.peekTopColor())
-			&& !targetTube.isFull();
+			&& !targetTube.isFull() && !targetTube.isComplete();
 	}
 	
 	pourColorInto(sourceTube, targetTube)
@@ -104,22 +103,22 @@ class Controller
 	{
 		if (tube.isComplete())
 		{
-			this.game.removeTube(tube);
+			//this.#game.removeTube(tube);
 			this.checkGameCompletion();
 		}
 	}
 	
 	checkGameCompletion()
 	{
-		if (this.game.tubesNumber() == 1 && this.game.tubeAt(0).isEmpty())
+		if (this.#game.tubesNumber() == 1 && this.#game.tubeAt(0).isEmpty())
 		{
-			this.game.clean();
+			this.#game.clean();
 		}
 	}
 
 	mousePressed(e) 
 	{
-		let clickedTubeId = this.drawer.getTubeIdAt(mouseX, mouseY);
+		let clickedTubeId = this.#drawer.getTubeIdAt(mouseX, mouseY);
 		this.clickTube(clickedTubeId);
 		
 		this.needUpdate = true;
@@ -127,21 +126,26 @@ class Controller
 	
 	runLoop()
 	{
-		const timeDelta = millis() - lastTime;
+		const timeDelta = millis() - this.lastTime;
 		// peut-être pas nécessaire de limiter le framerate
 		if (timeDelta < 50)
 			return;
 		this.lastTime = millis();
 		
 		const steps = [
-			(this.needUpdate || this.game.isCompleted) && drawGame,
-			this.game.isCompleted && drawUI
+			(this.needUpdate || this.#game.isCompleted) && this.drawGame,
+			this.#game.isCompleted && this.drawUI
 		]
 
-		steps.forEach(step => step && step());
+		steps.forEach(step => step && step.call(this));
+	}
+
+	drawGame()
+	{
+		this.#drawer.draw(this.#game);
 	}
 
-	function drawUI()
+	drawUI()
 	{
 		this.ui.drawWinView();
 	}

js/model/game.js

@@ -4,8 +4,8 @@ class Game {
 	
 	constructor(nbTubes, tubeLevel)
 	{
-		this.tubes = [];
-		this.selectedTube = null;
+		this.#tubes = [];
+		this.#selectedTube = null;
 		this.isCompleted = false;
 
 		for (let i = 0; i < nbTubes; i++)