leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some fallout from all that editor rendering stuff

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-01-03 18:43:24 -07:00
parent 1ce704864c
commit 683ab6a2c9
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/main-editor.js
View File

@ -2755,7 +2755,7 @@ export class Editor extends PrimaryView {
for (let i = 0; i < size_x * size_y; i++) { for (let i = 0; i < size_x * size_y; i++) {
stored_level.linear_cells.push(this._make_cell(...stored_level.scalar_to_coords(i))); stored_level.linear_cells.push(this._make_cell(...stored_level.scalar_to_coords(i)));
} }
stored_level.linear_cells[LAYERS.actor] = {type: TILE_TYPES['player'], direction: 'south'}; stored_level.linear_cells[0][LAYERS.actor] = {type: TILE_TYPES['player'], direction: 'south'};
return stored_level; return stored_level;
} }

21
js/renderer-canvas.js
View File

@ -82,19 +82,24 @@ export class CanvasRenderer {
this.blit(ctx, tx + mx, ty + my, offsetx + mdx, offsety + mdy, mw, mh); this.blit(ctx, tx + mx, ty + my, offsetx + mdx, offsety + mdy, mw, mh);
} }
_adjust_viewport_if_dirty() {
if (! this.viewport_dirty)
return;
this.viewport_dirty = false;
this.canvas.setAttribute('width', this.tileset.size_x * this.viewport_size_x);
this.canvas.setAttribute('height', this.tileset.size_y * this.viewport_size_y);
this.canvas.style.setProperty('--viewport-width', this.viewport_size_x);
this.canvas.style.setProperty('--viewport-height', this.viewport_size_y);
}
draw(tic_offset = 0) { draw(tic_offset = 0) {
if (! this.level) { if (! this.level) {
console.warn("CanvasRenderer.draw: No level to render"); console.warn("CanvasRenderer.draw: No level to render");
return; return;
} }
if (this.viewport_dirty) { this._adjust_viewport_if_dirty();
this.viewport_dirty = false;
this.canvas.setAttribute('width', this.tileset.size_x * this.viewport_size_x);
this.canvas.setAttribute('height', this.tileset.size_y * this.viewport_size_y);
this.canvas.style.setProperty('--viewport-width', this.viewport_size_x);
this.canvas.style.setProperty('--viewport-height', this.viewport_size_y);
}
let tic = (this.level.tic_counter ?? 0) + tic_offset; let tic = (this.level.tic_counter ?? 0) + tic_offset;
let tw = this.tileset.size_x; let tw = this.tileset.size_x;
@ -237,6 +242,8 @@ export class CanvasRenderer {
// Used by the editor and map previews. Draws a region of the level (probably a StoredLevel), // Used by the editor and map previews. Draws a region of the level (probably a StoredLevel),
// assuming nothing is moving. // assuming nothing is moving.
draw_static_region(x0, y0, x1, y1, destx = x0, desty = y0) { draw_static_region(x0, y0, x1, y1, destx = x0, desty = y0) {
this._adjust_viewport_if_dirty();
for (let x = x0; x <= x1; x++) { for (let x = x0; x <= x1; x++) {
for (let y = y0; y <= y1; y++) { for (let y = y0; y <= y1; y++) {
let cell = this.level.cell(x, y); let cell = this.level.cell(x, y);