Compare commits

..

No commits in common. "5eb24797a2466a8764b116ec2dba2db07a66db02" and "f178148416d7638206d938a51b8de1ac494ff181" have entirely different histories.

13 changed files with 381 additions and 346 deletions

View File

@ -1,9 +0,0 @@
repos:
- repo: https://github.com/pre-commit/mirrors-eslint
rev: "v8.28.0"
hooks:
- id: eslint
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v2.7.1"
hooks:
- id: prettier

22
package-lock.json generated
View File

@ -12,7 +12,8 @@
"install": "^0.13.0", "install": "^0.13.0",
"pinia": "^2.0.27", "pinia": "^2.0.27",
"vite": "^3.2.4", "vite": "^3.2.4",
"vue": "3.2" "vue": "3.2",
"vuex": "4.1"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.28.0", "eslint": "^8.28.0",
@ -2019,6 +2020,17 @@
"eslint": ">=6.0.0" "eslint": ">=6.0.0"
} }
}, },
"node_modules/vuex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
"integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
"dependencies": {
"@vue/devtools-api": "^6.0.0-beta.11"
},
"peerDependencies": {
"vue": "^3.2.0"
}
},
"node_modules/which": { "node_modules/which": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@ -3380,6 +3392,14 @@
"semver": "^7.3.6" "semver": "^7.3.6"
} }
}, },
"vuex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
"integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
"requires": {
"@vue/devtools-api": "^6.0.0-beta.11"
}
},
"which": { "which": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

View File

@ -14,7 +14,8 @@
"install": "^0.13.0", "install": "^0.13.0",
"pinia": "^2.0.27", "pinia": "^2.0.27",
"vite": "^3.2.4", "vite": "^3.2.4",
"vue": "3.2" "vue": "3.2",
"vuex": "4.1"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.28.0", "eslint": "^8.28.0",

View File

@ -9,140 +9,138 @@
</main> </main>
</template> </template>
<script> <script>
import { mapActions, mapState, mapWritableState } from "pinia"; import {
import { globalStore } from "../stores/index.js"; create1dState,
import { create1dStateOneCell,
create1dState, create2dState,
create1dStateOneCell, createBoard,
create2dState, conwayRules,
createBoard, evolve2d,
conwayRules, } from "../modules/automata.js";
evolve2d, import { getRandomInt, sleep } from "../modules/common.js";
} from "../modules/automata.js"; import { mapGetters } from "vuex";
import { getRandomInt, sleep } from "../modules/common.js"; export default {
name: "CanvasBoard",
export default { data() {
name: "CanvasBoard", return {
data() { canvas: null,
return { ctx: null,
canvas: null, };
ctx: null, },
}; computed: {
...mapGetters({
cellProperties: "getCellProperties",
rules: "get1dRules",
canvasWidth: "getCanvasWidth",
canvasHeight: "getCanvasHeight",
refreshRate: "getRefreshRate",
initial1dState: "getInitial1dState",
drawingDirection: "getDrawingDirection",
canDraw: "getCanDraw",
lastBoard: "getLastBoard",
getDraw1d: "getDraw1d",
getDraw2d: "getDraw2d",
getDraw2dLast: "getDraw2dLast",
getReset: "getReset",
}),
boardWidth: function () {
return Math.floor(this.canvasWidth / this.cellProperties.size);
}, },
computed: { boardHeight: function () {
...mapState(globalStore, { return Math.floor(this.canvasHeight / this.cellProperties.size);
cellProperties: "cellProperties",
rules: "rules1d",
refreshRate: "refreshRate",
initial1dState: "initial1dState",
drawingDirection: "drawingDirection",
canDraw: "canDraw",
getDraw1d: "draw1d",
getDraw2d: "draw2d",
getDraw2dLast: "draw2dLast",
}),
...mapWritableState(globalStore, {
lastBoard: "lastBoard",
canvasWidth: "canvasWidth",
canvasHeight: "canvasHeight",
getReset: "reset",
}),
boardWidth: function () {
return Math.floor(this.canvasWidth / this.cellProperties.size);
},
boardHeight: function () {
return Math.floor(this.canvasHeight / this.cellProperties.size);
},
}, },
watch: { },
getDraw1d(value) { watch: {
if (value == true) this.draw1d(); getDraw1d(value) {
}, if (value == true) this.draw1d();
getDraw2d(value) {
if (value == true) this.draw2dNew();
},
getDraw2dLast(value) {
if (value == true) this.draw2dLast();
},
getReset(value) {
if (value == true) this.reset();
},
}, },
mounted() { getDraw2d(value) {
this.canvas = Object.freeze(document.getElementById("canvas-board")); if (value == true) this.draw2dNew();
this.ctx = this.canvas.getContext("2d");
this.canvasWidth = this.canvas.parentElement.clientWidth;
this.canvasHeight = this.canvas.parentElement.clientHeight;
}, },
methods: { getDraw2dLast(value) {
...mapActions(globalStore, ["toggleStop"]), if (value == true) this.draw2dLast();
drawCanvas(board) { },
const props = this.cellProperties; getReset(value) {
board.map((row, y) => { if (value == true) this.reset();
const d = props.size; },
return row.map((cell, x) => { },
this.ctx.fillStyle = (() => { mounted() {
if (cell === 1) return props.liveColor; this.canvas = Object.freeze(document.getElementById("canvas-board"));
return props.deadColor; this.ctx = this.canvas.getContext("2d");
})(); this.$store.commit("setCanvasWidth", this.canvas.parentElement.clientWidth);
if (this.drawingDirection === "x") this.$store.commit(
this.ctx.fillRect(y * d, x * d, d, d); "setCanvasHeight",
else this.ctx.fillRect(x * d, y * d, d, d); this.canvas.parentElement.clientHeight
return cell; );
}); },
methods: {
drawCanvas(board) {
const props = this.cellProperties;
board.map((row, y) => {
const d = props.size;
return row.map((cell, x) => {
this.ctx.fillStyle = (() => {
if (cell === 1) return props.liveColor;
return props.deadColor;
})();
if (this.drawingDirection === "x")
this.ctx.fillRect(y * d, x * d, d, d);
else this.ctx.fillRect(x * d, y * d, d, d);
return cell;
}); });
}, });
compute1dInitialState() {
if (this.initial1dState === "onecell")
return create1dStateOneCell(this.boardWidth);
return create1dState(this.boardWidth, getRandomInt, [0, 2]);
},
draw1d() {
const initialState = this.compute1dInitialState();
const board = createBoard(
initialState,
this.rules.rules,
this.boardWidth
);
this.lastBoard = Object.freeze(board);
this.drawCanvas(board);
this.toggleStop();
},
draw2d(board) {
if (!this.canDraw) return;
const draw2dNext = async (b) => {
if (!this.canDraw) return;
const newBoard = evolve2d(b, conwayRules);
this.drawCanvas(b, this.cellProperties);
await sleep(this.refreshRate);
draw2dNext(newBoard);
};
return draw2dNext(board);
},
draw2dNew() {
const initialState = create2dState(
this.boardWidth,
this.boardHeight,
getRandomInt,
[0, 2]
);
const board = evolve2d(initialState, conwayRules);
this.lastBoard = Object.freeze(board);
this.draw2d(board);
},
async draw2dLast() {
if (this.lastBoard != undefined) this.draw2d(this.lastBoard);
},
reset() {
this.toggleStop();
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
this.getReset = 0;
},
}, },
}; compute1dInitialState() {
if (this.initial1dState === "onecell")
return create1dStateOneCell(this.boardWidth);
return create1dState(this.boardWidth, getRandomInt, [0, 2]);
},
draw1d() {
const initialState = this.compute1dInitialState();
const board = createBoard(
initialState,
this.rules.rules,
this.boardWidth
);
this.$store.commit("setLastBoard", Object.freeze(board));
this.drawCanvas(board);
this.$store.dispatch("stop");
},
draw2d(board) {
if (!this.canDraw) return;
const draw2dNext = async (b) => {
if (!this.canDraw) return;
const newBoard = evolve2d(b, conwayRules);
this.drawCanvas(b, this.cellProperties);
await sleep(this.refreshRate);
draw2dNext(newBoard);
};
return draw2dNext(board);
},
draw2dNew() {
const initialState = create2dState(
this.boardWidth,
this.boardHeight,
getRandomInt,
[0, 2]
);
const board = evolve2d(initialState, conwayRules);
this.$store.commit("setLastBoard", Object.freeze(board));
this.draw2d(board);
},
async draw2dLast() {
this.draw2d(this.lastBoard);
},
reset() {
this.$store.dispatch("stop");
this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
this.$store.commit("toggleReset", 0);
},
},
};
</script> </script>
<style> <style>
#mainContent { #mainContent {
min-width: 70%; min-width: 70%;
} }
</style> </style>

View File

@ -8,55 +8,55 @@
</template> </template>
<script> <script>
import MenuCellProperties from "./MenuCellProperties.vue"; import MenuCellProperties from "./MenuCellProperties.vue";
import MenuGeneralOptions from "./MenuGeneralOptions.vue"; import MenuGeneralOptions from "./MenuGeneralOptions.vue";
import MenuElementaryCA from "./MenuElementaryCA.vue"; import MenuElementaryCA from "./MenuElementaryCA.vue";
import Menu2dCA from "./Menu2dCA.vue"; import Menu2dCA from "./Menu2dCA.vue";
export default { export default {
name: "MainMenu", name: "MainMenu",
components: { components: {
MenuCellProperties, MenuCellProperties,
MenuGeneralOptions, MenuGeneralOptions,
MenuElementaryCA, MenuElementaryCA,
Menu2dCA, Menu2dCA,
}, },
}; };
</script> </script>
<style> <style>
#sidebar {
width: 25%;
padding: 0 10px;
overflow-y: scroll;
}
/* Hide scrollbar for Chrome, Safari and Opera */
#sidebar::-webkit-scrollbar {
display: none;
}
/* Hide scrollbar for IE, Edge and Firefox */
#sidebar {
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
@media screen and (max-width: 800px) {
#container {
display: flex;
flex-direction: column;
justify-content: center;
}
#mainContent {
flex: 1;
width: 100%;
}
#sidebar { #sidebar {
width: 25%; flex: 1;
padding: 0 10px; padding: 0;
overflow-y: scroll; width: 100%;
}
/* Hide scrollbar for Chrome, Safari and Opera */
#sidebar::-webkit-scrollbar {
display: none;
}
/* Hide scrollbar for IE, Edge and Firefox */
#sidebar {
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}
@media screen and (max-width: 800px) {
#container {
display: flex;
flex-direction: column;
justify-content: center;
}
#mainContent {
flex: 1;
width: 100%;
}
#sidebar {
flex: 1;
padding: 0;
width: 100%;
}
} }
}
</style> </style>

View File

@ -2,50 +2,55 @@
<MenuRow row-title="2D Cellular Automata"> <MenuRow row-title="2D Cellular Automata">
<div class="form-field"> <div class="form-field">
<label>Start from last result</label> <label>Start from last result</label>
<input type="button" value="start" @click="toggleDraw2dLast()" /> <input type="button" value="start" @click="draw2dLast" />
</div> </div>
<div class="form-field"> <div class="form-field">
<input <input type="button" name="start2d" value="start" @click="draw2d" />
type="button"
name="start2d"
value="start"
@click="toggleDraw2d()"
/>
<input <input
type="button" type="button"
name="stop" name="stop"
class="stop" class="stop"
value="stop" value="stop"
@click="toggleStop()" @click="stop"
/> />
<input <input
type="button" type="button"
name="reset" name="reset"
class="reset" class="reset"
value="reset" value="reset"
@click="toggleReset()" @click="reset"
/> />
</div> </div>
</MenuRow> </MenuRow>
</template> </template>
<script> <script>
import { mapActions } from "pinia"; import MenuRow from "./MenuRow.vue";
import MenuRow from "./MenuRow.vue"; import { mapGetters } from "vuex";
import { globalStore } from "../stores/index.js";
export default { export default {
name: "Menu2dCA", name: "Menu2dCA",
components: { components: {
MenuRow, MenuRow,
},
computed: {
...mapGetters({
lastBoard: "getLastBoard",
}),
},
methods: {
draw2d() {
this.$store.dispatch("draw2d");
}, },
methods: { draw2dLast() {
...mapActions(globalStore, [ this.$store.dispatch("draw2dLast");
"toggleDraw2d",
"toggleDraw2dLast",
"toggleReset",
"toggleStop",
]),
}, },
}; reset() {
this.$store.dispatch("reset");
},
stop() {
this.$store.dispatch("stop");
},
},
};
</script> </script>

View File

@ -34,27 +34,29 @@
</template> </template>
<script> <script>
import { mapWritableState } from "pinia"; import MenuRow from "./MenuRow.vue";
import { globalStore } from "../stores/index.js"; export default {
import MenuRow from "./MenuRow.vue"; name: "MainMenu",
export default { components: {
name: "MainMenu", MenuRow,
components: { },
MenuRow, data() {
return {
cellProperties: this.$store.state.cellProperties,
};
},
methods: {
getCellProperties(event) {
const elem = event.target;
const prop = this.$store.state.cellProperties;
return prop[elem.name];
}, },
computed: { updateCellProperties(event) {
...mapWritableState(globalStore, ["cellProperties"]), const elem = event.target;
const prop = { name: elem.name, value: elem.value };
//console.log(prop)
this.$store.commit("setCellProperties", prop);
}, },
methods: { },
getCellProperties(event) { };
const elem = event.target;
const prop = this.cellProperties;
return prop[elem.name];
},
updateCellProperties(event) {
const elem = event.target;
this.cellProperties[elem.name] = elem.value;
},
},
};
</script> </script>

View File

@ -25,7 +25,7 @@
</div> </div>
<div class="form-field"> <div class="form-field">
<label <label
>Rules presets >Rules presets
<br /> <br />
<select <select
name="ruleset-elementary" name="ruleset-elementary"
@ -51,7 +51,7 @@
class="form-field" class="form-field"
> >
<label <label
>{{ name }} >{{ name }}
<input <input
:value="rule" :value="rule"
type="checkbox" type="checkbox"
@ -63,21 +63,21 @@
</div> </div>
</form> </form>
<div class="form-field"> <div class="form-field">
<input type="button" name="start" value="start" @click="toggleDraw1d()" /> <input type="button" name="start" value="start" @click="draw1d" />
<input <input
type="button" type="button"
name="reset" name="reset"
class="reset" class="reset"
value="reset" value="reset"
@click="toggleReset" @click="reset"
/> />
</div> </div>
</MenuRow> </MenuRow>
</template> </template>
<script> <script>
import { mapActions, mapWritableState } from "pinia"; import { mapActions, mapState, mapWritableState } from 'pinia'
import { presetRules, initialStates } from "./preset.js"; import { presetRules, initialStates } from "./preset.js"
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 {
@ -92,23 +92,28 @@
}; };
}, },
computed: { computed: {
...mapWritableState(globalStore, { ...mapWritableState(
initialState: "initial1dState", globalStore, {
rules: "rules1d", initialState: "initial1dState",
}), }
),
...mapState(
globalStore, {
rules: "rules1d"
}
),
rules1dFileName() { rules1dFileName() {
// TODO: broken
return ( return (
Object.keys(this.rules) Object.keys(this.rules)
.map((index) => { .map((index) => {
return this.rules[index]; return this.rules[index];
}) })
.join("_") + ".json" .join("_") + ".json"
); );
}, },
}, },
methods: { methods: {
...mapActions(globalStore, ["toggleDraw1d", "toggleReset"]), ...mapActions(globalStore, ["draw1d", "reset"]),
copyRules() { copyRules() {
const rules = JSON.stringify(this.rules); const rules = JSON.stringify(this.rules);
navigator.clipboard.writeText(rules); navigator.clipboard.writeText(rules);
@ -128,20 +133,20 @@
const newRuleset = this.presetRules.find((ruleset) => { const newRuleset = this.presetRules.find((ruleset) => {
return ruleset.name === name; return ruleset.name === name;
}); });
this.rules.rules = newRuleset.rules; this.rules.rules = newRuleset.rules
}, },
updateInitialState(event) { updateInitialState(event) {
const elem = event.target; const elem = event.target;
this.initial1dState = elem.value; this.initial1dState = elem.value
}, },
}, },
}; };
</script> </script>
<style> <style>
.menu-row a { .menu-row a {
color: white; color: white;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
font-size: small; font-size: small;
} }
</style> </style>

View File

@ -56,40 +56,40 @@
</template> </template>
<script> <script>
import { mapWritableState } from "pinia"; import MenuRow from "./MenuRow.vue";
import { globalStore } from "../stores/index.js"; import { mapGetters } from "vuex";
import MenuRow from "./MenuRow.vue"; export default {
export default { name: "MenuGeneralOptions",
name: "MenuGeneralOptions", components: {
components: { MenuRow,
MenuRow, },
computed: {
...mapGetters({
canvasWidth: "getCanvasWidth",
canvasHeight: "getCanvasHeight",
refreshRate: "getRefreshRate",
drawingDirection: "getDrawingDirection",
}),
},
methods: {
updateCanvasHeight: function (event) {
const elem = event.target;
this.$store.commit("setCanvasHeight", elem.value);
}, },
computed: { updateCanvasWidth: function (event) {
...mapWritableState(globalStore, [ const elem = event.target;
"canvasWidth", this.$store.commit("setCanvasWidth", elem.value);
"canvasHeight",
"refreshRate",
"drawingDirection",
]),
}, },
methods: { updateRefreshRate: function (event) {
updateCanvasHeight: function (event) { const elem = event.target;
const elem = event.target; this.$store.commit("setRefreshRate", elem.value);
this.canvasHeight = elem.value;
},
updateCanvasWidth: function (event) {
const elem = event.target;
this.canvasWidth = elem.value;
},
updateRefreshRate: function (event) {
const elem = event.target;
this.refreshRate = elem.value;
},
updateDrawingDirection: function (event) {
const elem = event.target;
const value = elem.checked ? "x" : "y";
this.drawingDirection = value;
},
}, },
}; updateDrawingDirection: function (event) {
const elem = event.target;
const value = elem.checked ? "x" : "y";
this.$store.commit("setDrawingDirection", value);
console.log(this.drawingDirection);
},
},
};
</script> </script>

View File

@ -10,66 +10,66 @@
</template> </template>
<script> <script>
import { mapWritableState } from "pinia"; import { mapGetters } from "vuex";
import { globalStore } from "../stores/index.js";
export default { export default {
name: "MenuRow", name: "MenuRow",
props: { props: {
rowTitle: { rowTitle: {
type: String, type: String,
default: "", default: "",
},
}, },
computed: { },
// TODO: should be passed as a props/slot, not in a store computed: {
...mapWritableState(globalStore, ["activeMenu"]), ...mapGetters({
activeMenu: "getActiveMenu",
}),
},
methods: {
updateActiveMenu(event) {
const elem = event.target;
const value = elem.id;
if (value == this.activeMenu) this.$store.commit("setActiveMenu", "");
else this.$store.commit("setActiveMenu", value);
}, },
methods: { },
updateActiveMenu(event) { };
const elem = event.target;
const value = elem.id;
if (value == this.activeMenu) this.activeMenu = "";
else this.activeMenu = value;
},
},
};
</script> </script>
<style> <style>
.menu-row h2 { .menu-row h2 {
font-size: medium; font-size: medium;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
border: 2px solid darkgrey; border: 2px solid darkgrey;
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
select { select {
margin-top: 10px; margin-top: 10px;
padding: 5px; padding: 5px;
} }
input[type="button"] { input[type="button"] {
min-width: 60px; min-width: 60px;
padding: 5px; padding: 5px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
} }
.form-field { .form-field {
display: flex; display: flex;
margin: 10px; margin: 10px;
justify-content: space-between; justify-content: space-between;
} }
.menu-row { .menu-row {
flex: 1; flex: 1;
} }
label, label,
.form-field label { .form-field label {
margin-right: 10px; margin-right: 10px;
font-weight: bold; font-weight: bold;
} }
</style> </style>

View File

@ -77,7 +77,7 @@ const presetRules = [
"000": 1, "000": 1,
}, },
}, },
]; ]
const initialStates = [ const initialStates = [
{ {
@ -90,6 +90,6 @@ const initialStates = [
name: "Random cell", name: "Random cell",
description: "State populated with random cells", description: "State populated with random cells",
}, },
]; ]
export { presetRules, initialStates }; export { presetRules, initialStates }

View File

@ -35,25 +35,25 @@ export const globalStore = defineStore("globalStore", {
draw2dLast: false, draw2dLast: false,
reset: false, reset: false,
canDraw: true, canDraw: true,
}; }
}, },
actions: { actions: {
toggleDraw1d() { draw1d() {
this.draw1d = true; this.draw1d = true;
}, },
toggleDraw2d() { draw2d() {
this.canDraw = true; this.canDraw = true;
this.draw2d = true; this.draw2d = true;
}, },
toggleDraw2dLast() { draw2dLast() {
this.canDraw = true; this.canDraw = true;
this.draw2dLast = true; this.draw2dLast = true;
}, },
toggleReset() { reset() {
this.toggleStop(); this.stop();
this.reset = true; this.reset = true;
}, },
toggleStop() { stop() {
this.draw1d = false; this.draw1d = false;
this.draw2d = false; this.draw2d = false;
this.draw2dLast = false; this.draw2dLast = false;

13
vue.config.js Normal file
View File

@ -0,0 +1,13 @@
module.exports = {
configureWebpack: {
devServer: {
overlay: {
warnings: true,
errors: true,
},
watchOptions: {
ignored: [/node_modules/, /public/, /\.#/],
},
},
},
};