draft: improved tracking of simulation time

index.html

@@ -312,6 +312,7 @@
 			    <div class="w3-bar-item bar-divider"></div>
 			    <button id="select-mode-button" class="w3-bar-item w3-button"><span class="material-icons">highlight_alt</span></button>
 			    <button id="place-mode-button" class="w3-bar-item w3-button"><span class="material-icons">edit</span></button>
+			    
 			    <button id="zoom-out-button" class="w3-bar-item w3-button w3-right"><span class="material-icons">zoom_out</span></button>
 			    <button id="zoom-in-button" class="w3-bar-item w3-button w3-right"><span class="material-icons">zoom_in</span></button>
 			  </div>

src/simulator.mjs

@@ -120,12 +120,13 @@ export class Simulator {
 		if (keepSeed) {
 
 			this.tileWorker.postMessage({ msg: 'set-seed', seed: this.seedTiles});
+		        this.tileBlockAtlas.add_many(this.seedTiles);
 
-			for (const tile of this.seedTiles) {
-				// this.addTile(tile.type, tile.coords);
-				// this.tileWorker.postMessage({ msg: 'add-tile', tid: tile.type.id, x: tile.coords.x, y: tile.coords.y});
-				this.tileBlockAtlas.add(tile.type, tile.coords);
-			}
+			// for (const tile of this.seedTiles) {
+			// 	// this.addTile(tile.type, tile.coords);
+			// 	// this.tileWorker.postMessage({ msg: 'add-tile', tid: tile.type.id, x: tile.coords.x, y: tile.coords.y});
+			// 	this.tileBlockAtlas.add(tile.type, tile.coords);
+			// }
 
 
 			Logger.log(Logger.INFO, "reset system to seed");
@@ -224,7 +225,7 @@ export class Simulator {
 		if (e.data.msg === "tile-added") {
 			const type = this.tileset.getTileTypeById(e.data.tid);
 			const coords = new Vector2D(e.data.x, e.data.y);
-			this.tileBlockAtlas.add(type, coords);
+			this.tileBlockAtlas.add_one(type, coords);
 			this.renderUpdate = true;
 		} else if (e.data.msg === "tiles-added") {
 			const fastForwardBuffer = e.data.buffer;
@@ -383,7 +384,8 @@ export class Simulator {
 	  	}
 
 	        this.selectedTile.render();
-		let infoStr = `Simulator: ${this.tileBlockAtlas.numTiles} tiles`;
+	        let time = this.tileBlockAtlas.history.length;
+		let infoStr = `Simulator: ${this.tileBlockAtlas.numTiles} tiles, Simulation time: ${time}`;
 		if (this.mouseoverQuad.visible) {
 			infoStr += ` --- Mouse Coordinates: (${this.mouseoverQuad.position.x}, ${this.mouseoverQuad.position.y})`
 		}
@@ -527,8 +529,18 @@ export class Simulator {
 			} else if (this.simulation_mode === 'SyncTAM') {
 				this.tileWorker.postMessage({ msg: 'mode-SyncTAM' });
 			}
+
+		    console.log(this.seedTiles.length);
+		    if (this.seedTiles.length == 0) {
+			let ttypes = this.tileset.tileTypes;
+			let tile = ttypes[Math.floor(Math.random()*ttypes.length)];
+			let origin = new Vector2D(0, 0);
+			this.tileBlockAtlas.add(tile, origin);
+			this.seedTiles.push({type: tile, coords: origin});
+		    }
 		    this.tileWorker.postMessage({ msg: 'set-seed', seed: this.seedTiles});
 			
+
 			Logger.log(Logger.INFO, `loaded ${this.simulation_mode} system file "${data.tdp.name}" with a seed of size ${this.seedTiles.length}`);
 
 			// Determine if we're in v1 or v2. V1 should use this.blockerDict and v2 should use this.tileset.tileGlueBlockers

src/tileblock.mjs

@@ -246,11 +246,15 @@ export class TileBlockAtlas {
     }
 
     stepBackward() {
-    	const coords = this.history.pop();
-    	return this.remove(coords);
+    	const attachments = this.history.pop();
+	for (let coords of attachments) {
+	    let success = this.remove(coords);
+	    if (!success) return false;
+	}
+    	return true;
     }
 
-    add(type, coords) {
+    add_inner(type, coords) {
 	const blockIndex = this.getBlockIndex(coords);
 
 	if (!this.tileBlocks.has(blockIndex.y))
@@ -270,10 +274,23 @@ export class TileBlockAtlas {
 
 	tileBlock.add(type, coords);
 
-		this.history.push(coords);
 	this.numTiles++;
     }
 
+    add_one(type, coords) {
+	this.add_inner(type, coords);
+	this.history.push([coords]);
+    }
+
+    add_many(attachments) {
+	var all_coords = [];
+	for (let a of attachments) {
+	    this.add_inner(a.type, a.coords);
+	    all_coords.push(a.coords);
+	}
+	this.history.push(all_coords);
+    }
+
     remove(coords) {
     	const blockIndex = this.getBlockIndex(coords);
 

src/tileworker.js

@@ -624,12 +624,12 @@ function stepForward(recursion_level = 0) {
 	}
 
 	addTile(tid, loc[0], loc[1]);
-		history.push({tid: tid, x: loc[0], y: loc[1]});
+	history.push([{tid: tid, x: loc[0], y: loc[1]}]);
 	ret_list.push([tid, loc[0], loc[1]]);
 
     } else {
 	const frontierList = Array.from(frontierMap.keys());
-
+	var history_step = [];
 	for (let i=0; i<frontierList.length; i++) {
 	    let tid;
 	    let loc;
@@ -660,11 +660,11 @@ function stepForward(recursion_level = 0) {
 	    }
 	    if (tid !== undefined) {
 		addTile(tid, loc[0], loc[1], false);
-				history.push({tid: tid, x: loc[0], y: loc[1]});
+		history_step.push({tid: tid, x: loc[0], y: loc[1]});
 		ret_list.push([tid, loc[0], loc[1]]);
 	    }
 	}
-
+	history.push(history_step);
 	for (let r = 0; r < ret_list.length; r++) {
 	    addNbrsToFrontier(ret_list[r][0], ret_list[r][1], ret_list[r][2]);
 	}
@@ -681,7 +681,9 @@ function stepBackward() {
 	}
 
 	const last = history.pop();
-	removeTile(last.x, last.y);
+        for (coords of last) {
+	    removeTile(coords.x, coords.y);
+	}
 
 	// console.log('tile removed', history, seedSize);