fixes #3

Ajout d'une fonctionnalité d'historique des
actions

index.html

@@ -9,8 +9,10 @@
 	<script src="./js/lib/p5.min.js"></script>
 	<script src="./js/model/tube.js"></script>
 	<script src="./js/model/game.js"></script>
+	<script src="./js/model/historyItem.js"></script>
 	<script src="./js/ui.js"></script>
 	<script src="./js/drawer.js"></script>
+	<script src="./js/historyHandler.js"></script>
 	<script src="./js/controller.js"></script>
 	<script src="./js/main.js"></script>
 </head>
@@ -34,6 +36,7 @@
 			<input type="number" size="5" id="scale" value="50">
 		</span>
 		<button type="button" onclick="controller.initializeGame()">New game</button>
+		<button type="button" onclick="controller.undoPreviousAction()">Undo</button>
 	</div>
 	<div class="row justify-center">
 		<main oncontextmenu="return false;">

js/controller.js

@@ -3,6 +3,7 @@ class Controller
 	#game;
 	#drawer;
 	#colorsBank = ['black','silver','gray','maroon','red','purple','fuchsia','green','lime','olive','yellow','navy','blue','teal','aqua'];
+	#historyHandler;
 	
 	constructor()
 	{
@@ -14,7 +15,7 @@ class Controller
 		
 		this.#game = new Game(params.TUBESNUMBERS, params.TUBESLEVELS);
 		this.#drawer = new Drawer(params.PADDING, params.SCALE);
-		
+		this.#historyHandler = new HistoryHandler();		
 		this.#drawer.computeGameParams(params.TUBESNUMBERS, params.TUBESLEVELS);
 
 		this.ui = new UI(800, 600);
@@ -90,10 +91,15 @@ class Controller
 	
 	pourColorInto(sourceTube, targetTube)
 	{
+		let times = 0;
+
 		do
 		{
 			targetTube.addColorLayer(sourceTube.removeColorLayer());
+			times++;
 		} while (this.canPourInto(sourceTube, targetTube) && !targetTube.isComplete());
+
+		this.#historyHandler.log(sourceTube, targetTube, times);
 		
 		//this.checkTubeCompletion(sourceTube);
 		//this.checkTubeCompletion(targetTube);
@@ -116,6 +122,11 @@ class Controller
 		}
 	}
 
+	undoPreviousAction()
+	{
+		this.#historyHandler.restore();
+	}
+	
 	mousePressed(e) 
 	{
 		let clickedTubeId = this.#drawer.getTubeIdAt(mouseX, mouseY);

js/historyHandler.js

@@ -0,0 +1,39 @@
+class HistoryHandler
+{
+    #history;
+
+    constructor()
+    {
+        this.#history = [];
+    }
+
+    restore()
+    {
+        if (this.empty()) return;
+
+        let lastAction = this.#history.pop();
+
+        for (let i = 0; i < lastAction.times; i++)
+        {
+            let color = lastAction.targetTube.removeColorLayer();
+            lastAction.sourceTube.addColorLayer(color);
+        }
+    }
+
+    empty()
+    {
+        return this.#history.length == 0;
+    }
+
+    size()
+    {
+        return this.#history.length;
+    }
+
+    log(_source, _target, _times)
+    {
+        let historyItem = new HistoryItem(_source, _target, _times);
+
+        this.#history.push(historyItem);
+    }
+}

js/model/historyItem.js

@@ -0,0 +1,9 @@
+class HistoryItem
+{
+    constructor(_source, _target, _times)
+    {
+        this.sourceTube = _tbAIndex;
+        this.targetTube = _tbBIndex;
+        this.times = _times;
+    }
+}