Some slight refactoring

This commit is contained in:
dylan
2023-05-10 20:36:18 -07:00
parent 04f206814c
commit f8c1cebedb
4 changed files with 56 additions and 17 deletions

View File

@@ -30,18 +30,22 @@ const state = {
setSheet(page.activeSheet, "map", val);
},
setInPatch(i: number, sprsheet: number, sprite: number) {
const xx = this.selectedPatch%overviewW;
const yy = Math.floor(this.selectedPatch/overviewW);
const cell = (yy*patchH+Math.floor(i/patchW))*overviewW*patchW+xx*patchW+i%patchW;
this.map[cell] = [sprsheet, sprite];
const xx = patchW*(this.selectedPatch%overviewW);
const yy = patchH*Math.floor(this.selectedPatch/overviewW);
const cellVal = this.map.subgrid(xx, yy, patchW, patchH).values[i];
cellVal[0] = sprsheet
cellVal[1] = sprite;
// const cell = (yy*patchH+Math.floor(i/patchW))*overviewW*patchW+xx*patchW+i%patchW;
// this.map[cell] = [sprsheet, sprite];
},
get patch() {
const xx = this.selectedPatch%overviewW;
const yy = Math.floor(this.selectedPatch/overviewW);
return Array(overviewH).fill(0).flatMap((_, i) => {
const start = (yy*patchH+i)*overviewW*patchW+xx*patchW;
return this.map.slice(start, start+patchW);
})
const xx = patchW*(this.selectedPatch%overviewW);
const yy = patchH*Math.floor(this.selectedPatch/overviewW);
return this.map.subgrid(xx, yy, patchW, patchH);
// return Array(overviewH).fill(0).flatMap((_, i) => {
// const start = (yy*patchH+i)*overviewW*patchW+xx*patchW;
// return this.map.slice(start, start+patchW);
// })
}
}
@@ -139,7 +143,7 @@ const draw = () => {
// Draw the current patch
fillRect(patchX-1, patchY-1, (patchW*spriteW)+2, (patchH*spriteH)+2, COLOR.BLACK);
state.patch.forEach(([sprsheet, sprite], i) => {
state.patch.values.forEach(([sprsheet, sprite], i) => {
const spriteX = patchX+spriteW*(i%patchW);
const spriteY = patchY+spriteH*Math.floor(i/patchW);
if (getSheet(sprsheet).sheet_type === "spritesheet") {