Aurailus/VirtualDungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed overlay placement on certain ground tiles, fixed recalculating unnecessary tiles w/ smart tiler

Browse Source
This commit is contained in:
Nicole Collings 2020-03-17 11:06:21 -07:00
parent e1ddfb553a
commit dd48ee4728
5 changed files with 74 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map_scene/modes/ArchitectMode.ts
View File

@ -192,7 +192,7 @@ class ArchitectMode {
let lastTile = this.scene.map.getTile(manipPos.x, manipPos.y, layer);
if (tile == lastTile) return;
this.scene.map.setTile(manipPos.x, manipPos.y, tile, layer);
this.manipulated.push({

23
src/map_scene/tile/Tilemap.ts
View File

@ -32,7 +32,7 @@ class Tilemap {
this.map = this.scene.add.tilemap(null, 16, 16, 0, 0);
for (let res of Object.keys(this.manager.canvases)) this.createLayers(parseInt(res));
for (let res of this.manager.resolutions()) this.createLayers(parseInt(res));
for (let x = 0; x < this.dimensions.x; x ++) {
for (let y = 0; y < this.dimensions.y; y ++) {
@ -103,7 +103,7 @@ class Tilemap {
}
getTile(x: number, y: number, layer: Layer) {
return (layer == Layer.WALL ? this.getWall(x, y) : this.getGround(x, y));
return (layer == Layer.WALL ? this.getWall(x, y) : layer == Layer.GROUND ? this.getGround(x, y) : this.getOverlay(x, y));
}
setTile(x: number, y: number, tileset: number, layer: Layer): boolean {
@ -117,7 +117,7 @@ class Tilemap {
arr[x][y] = -1;
}
if (tileset != -1) this.layers[this.manager.getTilesetRes(tileset, layer)][layer].putTileAt(
this.manager.getGlobalTileIndex(tileset, (layer == Layer.GROUND ? 54 : 13), layer), x, y);
this.manager.getGlobalTileIndex(tileset, 0, layer), x, y);
arr[x][y] = tileset;
@ -134,20 +134,27 @@ class Tilemap {
}
let loc = this.manager.getTilesetRes(tileset, layer);
this.layers[loc][layer].putTileAt(this.manager.canvases[loc][layer].getGlobalIndex(tileset, tile), x, y);
this.layers[loc][layer].putTileAt(this.manager.getGlobalTileIndex(tileset, tile, layer), x, y);
arr[x][y] = tileset;
}
private calculateSmartTilesAround(x: number, y: number) {
private getTileAt(x: number, y: number, layer: number): number {
let arr = (layer == Layer.GROUND ? this.groundAt : layer == Layer.WALL ? this.wallAt : this.overlayAt);
if (arr[x][y] == -1) return -1;
return this.manager.getLocalTileIndex(arr[x][y], this.layers[this.manager.getTilesetRes(arr[x][y], layer)][layer].getTileAt(x, y, true).index, layer);
}
private calculateSmartTilesAround(x: number, y: number): void {
for (let i = clamp(x - 1, this.dimensions.x - 1, 0); i <= clamp(x + 1, this.dimensions.x - 1, 0); i++) {
for (let j = clamp(y - 1, this.dimensions.y - 1, 0); j <= clamp(y + 1, this.dimensions.y - 1, 0); j++) {
let wall = SmartTiler.wall(this.getWallsAround(i, j), this.wallAt[i][j]);
let wall = SmartTiler.wall(this.getWallsAround(i, j), this.getTileAt(i, j, Layer.WALL));
if (wall != -1) this.setTileRaw(i, j, this.wallAt[i][j], wall, Layer.WALL);
let ground = SmartTiler.ground(this.getWallsAround(i, j), this.groundAt[i][j]);
let ground = SmartTiler.ground(this.getWallsAround(i, j), this.getTileAt(i, j, Layer.GROUND));
if (ground != -1) this.setTileRaw(i, j, this.groundAt[i][j], ground, Layer.GROUND);
let overlay = SmartTiler.overlay(this.getOverlaysAround(i, j, this.overlayAt[i][j]), this.overlayAt[i][j]);
let overlay = SmartTiler.overlay(this.getOverlaysAround(i, j, this.overlayAt[i][j]), this.getTileAt(i, j, Layer.OVERLAY));
if (overlay != -1) this.setTileRaw(i, j, this.overlayAt[i][j], overlay, Layer.OVERLAY);
}
}

14
src/map_scene/tile/TilesetCanvas.ts
View File

@ -45,9 +45,17 @@ class TilesetCanvas {
return yy * this.width * 9 + xx;
}
private drawTileset(key: string, x: number, y: number) {
// this.canvas.drawFrame(key, 0, 9*this.res * x, 7*this.res * y);
getLocalIndex(tile: number): number {
const gX = tile % (this.width * 9);
const gY = Math.floor(tile / (this.width * 9));
const lX = gX % 9;
const lY = gY % 7;
return lX + lY * 9;
}
private drawTileset(key: string, x: number, y: number) {
let img: HTMLImageElement = this.manager.scene.textures.get(key).getSourceImage() as HTMLImageElement;
let refCanvas = document.createElement('canvas');
refCanvas.width = img.width;
@ -87,7 +95,7 @@ class TilesetCanvas {
this.canvas.setPixel(tileOffX + oX, tileOffY + l + this.pad, pixel[0], pixel[1], pixel[2], pixel[3]);
}
}
this.canvas.drawFrame(key, frame,
9 * (this.res + this.pad * 2) * x + i * (this.res + this.pad * 2) + this.pad,
7 * (this.res + this.pad * 2) * y + j * (this.res + this.pad * 2) + this.pad)

19
src/map_scene/tile/TilesetManager.ts
View File

@ -11,10 +11,11 @@ class TilesetManager {
private currentGroundInd: number = 0;
private currentOverlayInd: number = 0;
wallLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
groundLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
overlayLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
canvases: {[key: number /*Resolution*/]: TilesetCanvas[] } = {};
private wallLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
private groundLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
private overlayLocations: {[key: number /*Index*/]: { res: number, ind: number, key: string }} = {};
private canvases: {[key: number /*Resolution*/]: TilesetCanvas[] } = {};
indexes: {[key: string /*Tileset Key*/]: number} = {};
constructor(scene: MapScene) {
@ -42,6 +43,12 @@ class TilesetManager {
this.currentOverlayInd++;
}
resolutions(): string[] {
let resList: string[] = [];
for (let res of Object.keys(this.canvases)) resList.push(res);
return resList;
}
getTilesetRes(tileset: number, layer: Layer): number {
return layer == Layer.WALL ? this.wallLocations[tileset].res
: layer == Layer.GROUND ? this.groundLocations[tileset].res
@ -51,4 +58,8 @@ class TilesetManager {
getGlobalTileIndex(tileset: number, tile: number, layer: Layer): number {
return this.canvases[this.getTilesetRes(tileset, layer)][layer].getGlobalIndex(tileset, tile);
}
getLocalTileIndex(tileset: number, tile: number, layer: Layer): number {
return this.canvases[this.getTilesetRes(tileset, layer)][layer].getLocalIndex(tile);
}
}

39
tool.js
View File

@ -2390,6 +2390,7 @@ var SmartTiler;
else if (walls[BR])
tile = 0;
else {
console.log(current);
if (current >= 54 && current <= 60)
return -1;
tile = 54 + Math.floor(Math.random() * 6);
@ -2419,7 +2420,7 @@ var Tilemap = /** @class */ (function () {
}
this.manager = new TilesetManager(scene);
this.map = this.scene.add.tilemap(null, 16, 16, 0, 0);
for (var _i = 0, _a = Object.keys(this.manager.canvases); _i < _a.length; _i++) {
for (var _i = 0, _a = this.manager.resolutions(); _i < _a.length; _i++) {
var res = _a[_i];
this.createLayers(parseInt(res));
}
@ -2477,7 +2478,7 @@ var Tilemap = /** @class */ (function () {
return this.setTile(x, y, tileset, 2 /* OVERLAY */);
};
Tilemap.prototype.getTile = function (x, y, layer) {
return (layer == 1 /* WALL */ ? this.getWall(x, y) : this.getGround(x, y));
return (layer == 1 /* WALL */ ? this.getWall(x, y) : layer == 0 /* GROUND */ ? this.getGround(x, y) : this.getOverlay(x, y));
};
Tilemap.prototype.setTile = function (x, y, tileset, layer) {
if (x < 0 || y < 0 || x > this.dimensions.x - 1 || y > this.dimensions.y - 1)
@ -2490,7 +2491,7 @@ var Tilemap = /** @class */ (function () {
arr[x][y] = -1;
}
if (tileset != -1)
this.layers[this.manager.getTilesetRes(tileset, layer)][layer].putTileAt(this.manager.getGlobalTileIndex(tileset, (layer == 0 /* GROUND */ ? 54 : 13), layer), x, y);
this.layers[this.manager.getTilesetRes(tileset, layer)][layer].putTileAt(this.manager.getGlobalTileIndex(tileset, 0, layer), x, y);
arr[x][y] = tileset;
this.calculateSmartTilesAround(x, y);
return true;
@ -2502,19 +2503,25 @@ var Tilemap = /** @class */ (function () {
arr[x][y] = -1;
}
var loc = this.manager.getTilesetRes(tileset, layer);
this.layers[loc][layer].putTileAt(this.manager.canvases[loc][layer].getGlobalIndex(tileset, tile), x, y);
this.layers[loc][layer].putTileAt(this.manager.getGlobalTileIndex(tileset, tile, layer), x, y);
arr[x][y] = tileset;
};
Tilemap.prototype.getTileAt = function (x, y, layer) {
var arr = (layer == 0 /* GROUND */ ? this.groundAt : layer == 1 /* WALL */ ? this.wallAt : this.overlayAt);
if (arr[x][y] == -1)
return -1;
return this.manager.getLocalTileIndex(arr[x][y], this.layers[this.manager.getTilesetRes(arr[x][y], layer)][layer].getTileAt(x, y, true).index, layer);
};
Tilemap.prototype.calculateSmartTilesAround = function (x, y) {
for (var i = clamp(x - 1, this.dimensions.x - 1, 0); i <= clamp(x + 1, this.dimensions.x - 1, 0); i++) {
for (var j = clamp(y - 1, this.dimensions.y - 1, 0); j <= clamp(y + 1, this.dimensions.y - 1, 0); j++) {
var wall = SmartTiler.wall(this.getWallsAround(i, j), this.wallAt[i][j]);
var wall = SmartTiler.wall(this.getWallsAround(i, j), this.getTileAt(i, j, 1 /* WALL */));
if (wall != -1)
this.setTileRaw(i, j, this.wallAt[i][j], wall, 1 /* WALL */);
var ground = SmartTiler.ground(this.getWallsAround(i, j), this.groundAt[i][j]);
var ground = SmartTiler.ground(this.getWallsAround(i, j), this.getTileAt(i, j, 0 /* GROUND */));
if (ground != -1)
this.setTileRaw(i, j, this.groundAt[i][j], ground, 0 /* GROUND */);
var overlay = SmartTiler.overlay(this.getOverlaysAround(i, j, this.overlayAt[i][j]), this.overlayAt[i][j]);
var overlay = SmartTiler.overlay(this.getOverlaysAround(i, j, this.overlayAt[i][j]), this.getTileAt(i, j, 2 /* OVERLAY */));
if (overlay != -1)
this.setTileRaw(i, j, this.overlayAt[i][j], overlay, 2 /* OVERLAY */);
}
@ -2568,6 +2575,13 @@ var TilesetCanvas = /** @class */ (function () {
var yy = lY + gY * 9;
return yy * this.width * 9 + xx;
};
TilesetCanvas.prototype.getLocalIndex = function (tile) {
var gX = tile % (this.width * 9);
var gY = Math.floor(tile / (this.width * 9));
var lX = gX % 9;
var lY = gY % 7;
return lX + lY * 9;
};
TilesetCanvas.prototype.drawTileset = function (key, x, y) {
// this.canvas.drawFrame(key, 0, 9*this.res * x, 7*this.res * y);
var img = this.manager.scene.textures.get(key).getSourceImage();
@ -2644,6 +2658,14 @@ var TilesetManager = /** @class */ (function () {
layer == 0 /* GROUND */ ? this.currentGroundInd++ :
this.currentOverlayInd++;
};
TilesetManager.prototype.resolutions = function () {
var resList = [];
for (var _i = 0, _a = Object.keys(this.canvases); _i < _a.length; _i++) {
var res = _a[_i];
resList.push(res);
}
return resList;
};
TilesetManager.prototype.getTilesetRes = function (tileset, layer) {
return layer == 1 /* WALL */ ? this.wallLocations[tileset].res
: layer == 0 /* GROUND */ ? this.groundLocations[tileset].res
@ -2652,6 +2674,9 @@ var TilesetManager = /** @class */ (function () {
TilesetManager.prototype.getGlobalTileIndex = function (tileset, tile, layer) {
return this.canvases[this.getTilesetRes(tileset, layer)][layer].getGlobalIndex(tileset, tile);
};
TilesetManager.prototype.getLocalTileIndex = function (tileset, tile, layer) {
return this.canvases[this.getTilesetRes(tileset, layer)][layer].getLocalIndex(tile);
};
return TilesetManager;
}());
var BrightenPipeline = /** @class */ (function (_super) {