Compare commits
6 Commits
8972335198
...
1a5badaf48
Author | SHA1 | Date | |
---|---|---|---|
1a5badaf48 | |||
7d4016a213 | |||
1c96adc239 | |||
b5b223ba5c | |||
9b83b88c54 | |||
9f2699e2c8 |
17
src/App.vue
17
src/App.vue
@ -18,7 +18,7 @@
|
|||||||
import MainMenu from "./components/MainMenu.vue";
|
import MainMenu from "./components/MainMenu.vue";
|
||||||
import CanvasBoard from "./components/CanvasBoard.vue";
|
import CanvasBoard from "./components/CanvasBoard.vue";
|
||||||
import MenuReset from "./components/MenuReset.vue";
|
import MenuReset from "./components/MenuReset.vue";
|
||||||
import { mapWritableState, mapActions } from "pinia";
|
import { mapState, mapWritableState, mapActions } from "pinia";
|
||||||
import { globalStore } from "./stores/index.js";
|
import { globalStore } from "./stores/index.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -30,15 +30,12 @@
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
mainMenu: false,
|
|
||||||
windowWidth: window.innerWidth,
|
windowWidth: window.innerWidth,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapWritableState(globalStore, {
|
...mapState(globalStore, ["mainMenu", "activeSubMenu"]),
|
||||||
canvasWidth: "canvasWidth",
|
...mapWritableState(globalStore, ["canvasWidth", "canvasHeight"]),
|
||||||
canvasHeight: "canvasHeight",
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
@ -49,9 +46,13 @@
|
|||||||
window.removeEventListener("resize", this.onResize);
|
window.removeEventListener("resize", this.onResize);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(globalStore, ["setBoardWidth", "setBoardHeight"]),
|
...mapActions(globalStore, [
|
||||||
|
"setBoardWidth",
|
||||||
|
"setBoardHeight",
|
||||||
|
"setMainMenu",
|
||||||
|
]),
|
||||||
toggleMainMenu() {
|
toggleMainMenu() {
|
||||||
this.mainMenu = !this.mainMenu;
|
this.setMainMenu(!this.mainMenu);
|
||||||
},
|
},
|
||||||
onResize() {
|
onResize() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<canvas
|
<canvas
|
||||||
id="canvas-board"
|
id="board-canvas"
|
||||||
ref="canvas-board"
|
ref="board-canvas"
|
||||||
|
:width="canvasWidth"
|
||||||
|
:height="canvasHeight"
|
||||||
|
/>
|
||||||
|
<canvas
|
||||||
|
id="work-canvas"
|
||||||
|
ref="work-canvas"
|
||||||
:width="canvasWidth"
|
:width="canvasWidth"
|
||||||
:height="canvasHeight"
|
:height="canvasHeight"
|
||||||
/>
|
/>
|
||||||
@ -18,12 +24,15 @@
|
|||||||
evolve2d,
|
evolve2d,
|
||||||
} from "../modules/automata.js";
|
} from "../modules/automata.js";
|
||||||
import { getRandomInt, sleep } from "../modules/common.js";
|
import { getRandomInt, sleep } from "../modules/common.js";
|
||||||
|
import { picToBoard, picToBlackAndWhite } from "../modules/picture.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "CanvasBoard",
|
name: "CanvasBoard",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
canvas: null,
|
canvas: null,
|
||||||
|
workCanvas: null,
|
||||||
|
workCtx: null,
|
||||||
ctx: null,
|
ctx: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -72,8 +81,11 @@
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.canvas = Object.freeze(document.getElementById("canvas-board"));
|
this.canvas = Object.freeze(document.getElementById("board-canvas"));
|
||||||
|
this.workCanvas = Object.freeze(document.getElementById("work-canvas"));
|
||||||
this.ctx = this.canvas.getContext("2d");
|
this.ctx = this.canvas.getContext("2d");
|
||||||
|
this.workCtx = this.workCanvas.getContext("2d");
|
||||||
|
this.workCanvas.setAttribute("willReadFrequently", true);
|
||||||
this.canvasWidth = this.canvas.parentElement.clientWidth;
|
this.canvasWidth = this.canvas.parentElement.clientWidth;
|
||||||
this.canvasHeight = this.canvas.parentElement.clientHeight;
|
this.canvasHeight = this.canvas.parentElement.clientHeight;
|
||||||
this.setBoardWidth();
|
this.setBoardWidth();
|
||||||
@ -114,7 +126,7 @@
|
|||||||
const initialState = this.compute1dInitialState();
|
const initialState = this.compute1dInitialState();
|
||||||
const board = createBoard(initialState, this.ruleset.rules, this.max);
|
const board = createBoard(initialState, this.ruleset.rules, this.max);
|
||||||
this.lastBoard = Object.freeze(board);
|
this.lastBoard = Object.freeze(board);
|
||||||
this.drawCanvas(board);
|
this.drawCanvas(this.lastBoard);
|
||||||
this.toggleStop();
|
this.toggleStop();
|
||||||
},
|
},
|
||||||
// draw 2D automaton on the canvas (currently only the game of life)
|
// draw 2D automaton on the canvas (currently only the game of life)
|
||||||
@ -145,17 +157,55 @@
|
|||||||
draw2dLast() {
|
draw2dLast() {
|
||||||
if (this.lastBoard != undefined) this.draw2d(this.lastBoard);
|
if (this.lastBoard != undefined) this.draw2d(this.lastBoard);
|
||||||
},
|
},
|
||||||
// draw 2d automaton from an uploaded picture
|
// draw 2d automaton from an uploaded picture.
|
||||||
draw2dPicture(e) {
|
// use the picture representation as an initial state
|
||||||
this.picture.width = this.canvas.width;
|
draw2dPicture() {
|
||||||
this.picture.height = this.canvas.height;
|
// get image data by drawing it on a work canvas
|
||||||
this.ctx.drawImage(
|
this.workCtx.drawImage(
|
||||||
this.picture,
|
this.picture,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
this.canvas.width,
|
this.canvasWidth,
|
||||||
this.canvas.height
|
this.canvasHeight
|
||||||
);
|
);
|
||||||
|
const imgData = this.workCtx.getImageData(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
this.canvasWidth,
|
||||||
|
this.canvasHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
// convert the image to black and white
|
||||||
|
const black = picToBlackAndWhite(
|
||||||
|
imgData.data,
|
||||||
|
this.canvasWidth,
|
||||||
|
this.canvasHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
// draw it back on the canvas
|
||||||
|
this.ctx.putImageData(black, 0, 0);
|
||||||
|
|
||||||
|
// draw the image back on the work canvas with the dimensions of the board
|
||||||
|
this.workCtx.drawImage(
|
||||||
|
this.picture,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
this.boardWidth,
|
||||||
|
this.boardHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
const resized = this.workCtx.getImageData(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
this.boardWidth,
|
||||||
|
this.boardHeight
|
||||||
|
);
|
||||||
|
|
||||||
|
// convert the resized image into a 2D board of boolean based on pixel value
|
||||||
|
this.lastBoard = Object.freeze(
|
||||||
|
picToBoard(resized.data, this.boardWidth, this.boardHeight)
|
||||||
|
);
|
||||||
|
|
||||||
this.toggleStop();
|
this.toggleStop();
|
||||||
},
|
},
|
||||||
// stop drawing routines and clear the canvas
|
// stop drawing routines and clear the canvas
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="main-menu">
|
<div id="main-menu">
|
||||||
<MenuGeneralOptions :active="active" @update-active="updateActive" />
|
<MenuGeneralOptions />
|
||||||
<MenuCellProperties :active="active" @update-active="updateActive" />
|
<MenuCellProperties />
|
||||||
<MenuElementaryCA :active="active" @update-active="updateActive" />
|
<MenuElementaryCA />
|
||||||
<Menu2dCA :active="active" @update-active="updateActive" />
|
<Menu2dCA />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -20,21 +20,6 @@
|
|||||||
MenuElementaryCA,
|
MenuElementaryCA,
|
||||||
Menu2dCA,
|
Menu2dCA,
|
||||||
},
|
},
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
active: "",
|
|
||||||
};
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
// set the opened submenu. If already active, reset it so it can close
|
|
||||||
updateActive(menu) {
|
|
||||||
if (menu === this.active) {
|
|
||||||
this.active = "";
|
|
||||||
} else {
|
|
||||||
this.active = menu;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@ -43,7 +28,6 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,11 +34,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapWritableState } from "pinia";
|
import { mapActions, mapWritableState } from "pinia";
|
||||||
import { globalStore } from "../stores/index.js";
|
import { globalStore } from "../stores/index.js";
|
||||||
import MenuRow from "./MenuRow.vue";
|
import MenuRow from "./MenuRow.vue";
|
||||||
export default {
|
export default {
|
||||||
name: "MainMenu",
|
name: "MenuCellProperties",
|
||||||
components: {
|
components: {
|
||||||
MenuRow,
|
MenuRow,
|
||||||
},
|
},
|
||||||
@ -46,6 +46,7 @@
|
|||||||
...mapWritableState(globalStore, ["cellProperties"]),
|
...mapWritableState(globalStore, ["cellProperties"]),
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
...mapActions(globalStore, ["setBoardHeight", "setBoardWidth"]),
|
||||||
getCellProperties(event) {
|
getCellProperties(event) {
|
||||||
const elem = event.target;
|
const elem = event.target;
|
||||||
const prop = this.cellProperties;
|
const prop = this.cellProperties;
|
||||||
@ -54,6 +55,8 @@
|
|||||||
updateCellProperties(event) {
|
updateCellProperties(event) {
|
||||||
const elem = event.target;
|
const elem = event.target;
|
||||||
this.cellProperties[elem.name] = elem.value;
|
this.cellProperties[elem.name] = elem.value;
|
||||||
|
this.setBoardWidth();
|
||||||
|
this.setBoardHeight();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -1,19 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="menu-row">
|
<div class="menu-row">
|
||||||
<h2 :id="rowTitle" @click="$emit('update-active', rowTitle)">
|
<h2 :id="rowTitle" @click.stop="storeActiveSubMenu">
|
||||||
{{ rowTitle }}
|
{{ rowTitle }}
|
||||||
</h2>
|
</h2>
|
||||||
<div
|
<div v-if="isActive" ref="content" class="menu-row-content">
|
||||||
v-if="isActive"
|
|
||||||
class="menu-row-content"
|
|
||||||
@mouseleave="$emit('update-active', '')"
|
|
||||||
>
|
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { mapActions, mapState } from "pinia";
|
||||||
|
import { globalStore } from "../stores/index.js";
|
||||||
export default {
|
export default {
|
||||||
name: "MenuRow",
|
name: "MenuRow",
|
||||||
props: {
|
props: {
|
||||||
@ -21,15 +19,38 @@
|
|||||||
type: String,
|
type: String,
|
||||||
default: "",
|
default: "",
|
||||||
},
|
},
|
||||||
active: {
|
},
|
||||||
type: String,
|
computed: {
|
||||||
default: "",
|
...mapState(globalStore, ["activeSubMenu"]),
|
||||||
|
isActive() {
|
||||||
|
return this.rowTitle == this.activeSubMenu;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
emits: ["update-active"],
|
beforeUnmount() {
|
||||||
computed: {
|
window.removeEventListener("click", this.onWindowClick);
|
||||||
isActive() {
|
},
|
||||||
return this.rowTitle == this.active;
|
methods: {
|
||||||
|
...mapActions(globalStore, ["setActiveSubMenu", "toggleMainMenu"]),
|
||||||
|
onKeyDown: function (event) {
|
||||||
|
// escape
|
||||||
|
if (event.keyCode == 27) {
|
||||||
|
this.setActiveSubMenu("");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
storeActiveSubMenu() {
|
||||||
|
window.addEventListener("click", this.onWindowClick);
|
||||||
|
this.setActiveSubMenu(this.rowTitle);
|
||||||
|
},
|
||||||
|
// hides submenu when click is detected outside from it
|
||||||
|
onWindowClick(event) {
|
||||||
|
const form = this.$refs.content;
|
||||||
|
if (form != null) {
|
||||||
|
if (!form.contains(event.target)) {
|
||||||
|
this.setActiveSubMenu("");
|
||||||
|
this.setMainMenu(false);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
39
src/modules/picture.js
Normal file
39
src/modules/picture.js
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// https://stackoverflow.com/questions/4492385/convert-simple-array-into-two-dimensional-array-matrix
|
||||||
|
// convert a 1D array into a 2D matrix
|
||||||
|
export function toMatrix(array, width) {
|
||||||
|
return array.reduce(
|
||||||
|
(rows, key, index) =>
|
||||||
|
(index % width == 0
|
||||||
|
? rows.push([key])
|
||||||
|
: rows[rows.length - 1].push(key)) && rows,
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert an image into a black and white image
|
||||||
|
export function picToBlackAndWhite(pixels, width, height) {
|
||||||
|
return pixels.reduce((acc, pixel, index) => {
|
||||||
|
if (index % 4 == 0) {
|
||||||
|
const count = pixels[index] + pixels[index + 1] + pixels[index + 2];
|
||||||
|
const colour = count >= 255 ? 255 : 1;
|
||||||
|
acc.data[index] = colour;
|
||||||
|
acc.data[index + 1] = colour;
|
||||||
|
acc.data[index + 2] = colour;
|
||||||
|
acc.data[index + 3] = 255;
|
||||||
|
}
|
||||||
|
return acc;
|
||||||
|
}, new ImageData(width, height));
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert an ImageData into a 2D array of boolean (0, 1) values
|
||||||
|
export function picToBoard(pixels, width, height) {
|
||||||
|
const flat = pixels.reduce((acc, pixel, index) => {
|
||||||
|
if (index % 4 == 0) {
|
||||||
|
const count = pixels[index] + pixels[index + 1] + pixels[index + 2];
|
||||||
|
const value = count >= 255 ? 1 : 0;
|
||||||
|
acc.push(value);
|
||||||
|
}
|
||||||
|
return acc;
|
||||||
|
}, []);
|
||||||
|
return toMatrix(flat, Math.max(width, height));
|
||||||
|
}
|
@ -36,6 +36,8 @@ export const globalStore = defineStore("globalStore", {
|
|||||||
reset: false,
|
reset: false,
|
||||||
canDraw: true,
|
canDraw: true,
|
||||||
picture: null,
|
picture: null,
|
||||||
|
mainMenu: false,
|
||||||
|
activeSubMenu: "",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
@ -48,20 +50,25 @@ export const globalStore = defineStore("globalStore", {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
toggleDraw1d() {
|
toggleDraw1d() {
|
||||||
|
this.setActiveSubMenu("");
|
||||||
|
this.setMainMenu(false);
|
||||||
this.draw1d = true;
|
this.draw1d = true;
|
||||||
},
|
},
|
||||||
toggleDraw2d() {
|
toggleDraw2d() {
|
||||||
|
this.setActiveSubMenu("");
|
||||||
|
this.setMainMenu(false);
|
||||||
this.toggleStop();
|
this.toggleStop();
|
||||||
this.canDraw = true;
|
this.canDraw = true;
|
||||||
this.draw2d = true;
|
this.draw2d = true;
|
||||||
},
|
},
|
||||||
toggleDraw2dLast() {
|
toggleDraw2dLast() {
|
||||||
|
this.setActiveSubMenu("");
|
||||||
|
this.setMainMenu(false);
|
||||||
this.toggleStop();
|
this.toggleStop();
|
||||||
this.canDraw = true;
|
this.canDraw = true;
|
||||||
this.draw2dLast = true;
|
this.draw2dLast = true;
|
||||||
},
|
},
|
||||||
toggle2dDrawFromPicture() {
|
toggle2dDrawFromPicture() {
|
||||||
console.log("toggleDraw2dFromPicture");
|
|
||||||
this.toggleStop();
|
this.toggleStop();
|
||||||
this.canDraw = true;
|
this.canDraw = true;
|
||||||
this.draw2dpicture = true;
|
this.draw2dpicture = true;
|
||||||
@ -77,5 +84,12 @@ export const globalStore = defineStore("globalStore", {
|
|||||||
this.draw2dpicture = false;
|
this.draw2dpicture = false;
|
||||||
this.canDraw = false;
|
this.canDraw = false;
|
||||||
},
|
},
|
||||||
|
setActiveSubMenu(data) {
|
||||||
|
if (this.activeSubMenu == data) this.activeSubMenu = "";
|
||||||
|
else this.activeSubMenu = data;
|
||||||
|
},
|
||||||
|
setMainMenu(data) {
|
||||||
|
this.mainMenu = data;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user