@rpgjs/client 3.0.0-beta.8 → 3.0.0

package/lib/Tilemap/Tile.d.ts

@@ -1,22 +1,21 @@
 import { Texture } from "pixi.js";
 import { RpgRectTileLayer } from "./TileLayer";
+import TileSet from "./TileSet";
+import { Tile as TiledTileClass } from '@rpgjs/tiled';
 export default class Tile extends PIXI.AnimatedSprite {
     private tile;
     private tileSet;
-    private horizontalFlip;
-    private verticalFlip;
-    private diagonalFlip;
-    static getTextures(tile: any, tileSet: any): Texture[];
+    static getTextures(tile: TiledTileClass, tileSet: TileSet): Texture[];
     animations: {
-        tileId: number;
+        tileid: number;
         duration: number;
     }[];
     _x: number;
     _y: number;
-    gid: number;
     pointsBufIndex: number;
     properties: any;
-    constructor(tile: any, tileSet: any, horizontalFlip: any, verticalFlip: any, diagonalFlip: any);
+    constructor(tile: TiledTileClass, tileSet: TileSet);
+    get gid(): number;
     setAnimation(frame: RpgRectTileLayer): void;
     flip(): void;
 }

package/lib/Tilemap/Tile.js

@@ -1,71 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class Tile extends PIXI.AnimatedSprite {
-    constructor(tile, tileSet, horizontalFlip, verticalFlip, diagonalFlip) {
+    constructor(tile, tileSet) {
         super(Tile.getTextures(tile, tileSet));
         this.tile = tile;
         this.tileSet = tileSet;
-        this.horizontalFlip = horizontalFlip;
-        this.verticalFlip = verticalFlip;
-        this.diagonalFlip = diagonalFlip;
         this.animations = [];
         this._x = 0;
         this._y = 0;
-        this.gid = 0;
         this.properties = {};
-        this._x = 0;
-        this._y = 0;
-        this.gid = 0;
-        this.animations = [];
+        this.animations = tile.animations || [];
+        this.properties = tile.properties;
         this.textures = Tile.getTextures(tile, tileSet);
         this.texture = this.textures[0];
-        Object.assign(this, tile);
         this.flip();
     }
     static getTextures(tile, tileSet) {
         const textures = [];
         if (tile.animations && tile.animations.length) {
             tile.animations.forEach(frame => {
-                textures.push(tileSet.textures[frame.tileId]);
+                textures.push(tileSet.textures[frame.tileid].clone());
             });
         }
         else {
-            textures.push(tileSet.textures[tile.gid - tileSet.firstGid]);
+            textures.push(tileSet.textures[tile.gid - tileSet.firstgid].clone());
         }
         return textures;
     }
+    get gid() {
+        return this.tile.gid;
+    }
     setAnimation(frame) {
         const size = this.animations.length;
         if (size > 1) {
-            const offest = (this.animations[1].tileId - this.animations[0].tileId) * this.width;
+            const offest = (this.animations[1].tileid - this.animations[0].tileid) * this.width;
             frame.tileAnimX(offest, size);
         }
     }
     flip() {
-        if (this.horizontalFlip) {
-            this.anchor.x = 1;
-            this.scale.x = -1;
+        let symmetry;
+        let i = 0;
+        const add = (symmetrySecond) => {
+            i++;
+            if (symmetry)
+                symmetry = PIXI.groupD8.add(symmetry, symmetrySecond);
+            else
+                symmetry = symmetrySecond;
+        };
+        if (this.tile.horizontalFlip) {
+            add(PIXI.groupD8.MIRROR_HORIZONTAL);
         }
-        if (this.verticalFlip) {
-            this.anchor.y = 1;
-            this.scale.y = -1;
+        if (this.tile.verticalFlip) {
+            add(PIXI.groupD8.MIRROR_VERTICAL);
         }
-        if (this.diagonalFlip) {
-            if (this.horizontalFlip) {
-                this.anchor.x = 0;
-                this.scale.x = 1;
-                this.anchor.y = 1;
-                this.scale.y = 1;
-                this.rotation = PIXI.DEG_TO_RAD * 90;
+        if (this.tile.diagonalFlip) {
+            if (i % 2 == 0) {
+                add(PIXI.groupD8.MAIN_DIAGONAL);
             }
-            if (this.verticalFlip) {
-                this.anchor.x = 1;
-                this.scale.x = 1;
-                this.anchor.y = 0;
-                this.scale.y = 1;
-                this.rotation = PIXI.DEG_TO_RAD * -90;
+            else {
+                add(PIXI.groupD8.REVERSE_DIAGONAL);
             }
         }
+        if (symmetry)
+            this.texture.rotate = symmetry;
     }
 }
 exports.default = Tile;

package/lib/Tilemap/Tile.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tile.js","sourceRoot":"","sources":["../../src/Tilemap/Tile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Tile.js","sourceRoot":"","sources":["../../src/Tilemap/Tile.ts"],"names":[],"mappings":"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"}

package/lib/Tilemap/TileLayer.d.ts

@@ -1,17 +1,20 @@
 import { CompositeRectTileLayer } from 'pixi-tilemap';
+import { Layer, Tile as TileClass } from '@rpgjs/tiled';
+import TileSet from './TileSet';
+import TileMap from '.';
+import { CommonLayer } from './CommonLayer';
 export interface RpgRectTileLayer extends CompositeRectTileLayer {
     children: {
         pointsBuf: number[];
         modificationMarker: number;
     }[];
 }
-export default class TileLayer extends PIXI.Container {
-    private layer;
+export default class TileLayer extends CommonLayer {
     private tileSets;
     private tilemap;
-    properties: any;
-    private tiles;
-    static findTileSet(gid: any, tileSets: any): any;
-    constructor(layer: any, tileSets: any);
+    private _tiles;
+    tiles: (TileClass | null)[];
+    static findTileSet(gid: number, tileSets: TileSet[]): TileSet | undefined;
+    constructor(layer: Layer, tileSets: TileSet[], map: TileMap);
     private addFrame;
 }

package/lib/Tilemap/TileLayer.js

@@ -5,22 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Tile_1 = __importDefault(require("./Tile"));
 const pixi_tilemap_1 = require("pixi-tilemap");
+const CommonLayer_1 = require("./CommonLayer");
 pixi_tilemap_1.pixi_tilemap.Constant.maxTextures = 4;
 pixi_tilemap_1.pixi_tilemap.Constant.use32bitIndex = true;
-class TileLayer extends PIXI.Container {
-    constructor(layer, tileSets) {
-        super();
-        this.layer = layer;
+class TileLayer extends CommonLayer_1.CommonLayer {
+    constructor(layer, tileSets, map) {
+        super(layer, map);
         this.tileSets = tileSets;
-        this.tiles = {};
-        this.alpha = layer.opacity;
-        Object.assign(this, layer);
+        this._tiles = {};
     }
     static findTileSet(gid, tileSets) {
         let tileset;
         for (let i = tileSets.length - 1; i >= 0; i--) {
             tileset = tileSets[i];
-            if (tileset.firstGid && tileset.firstGid <= gid) {
+            if (tileset.firstgid && tileset.firstgid <= gid) {
                 break;
             }
         }
@@ -28,32 +26,31 @@ class TileLayer extends PIXI.Container {
     }
     /** @internal */
     createTile(x, y, options = {}) {
+        var _a, _b;
         const { real, filter } = options;
-        const { width, tileWidth, tileHeight } = this.layer.map.data;
+        const { width, tilewidth, tileheight } = this.map.getData();
         if (real) {
-            x = Math.floor(x / tileWidth);
-            y = Math.floor(y / tileHeight);
+            x = Math.floor(x / tilewidth);
+            y = Math.floor(y / tileheight);
         }
         const i = x + y * width;
-        const tileLayer = this.layer.tiles[i];
-        if (!(tileLayer &&
-            tileLayer.gid &&
-            tileLayer.gid !== 0))
+        const tiledTile = this.layer.tiles[i];
+        if (!tiledTile || (tiledTile && tiledTile.gid == 0))
             return;
-        const tileset = TileLayer.findTileSet(tileLayer.gid, this.tileSets);
+        const tileset = TileLayer.findTileSet(tiledTile.gid, this.tileSets);
         if (!tileset)
             return;
-        const tile = new Tile_1.default(tileLayer, tileset, this.layer.horizontalFlips[i], this.layer.verticalFlips[i], this.layer.diagonalFlips[i]);
-        tile.x = x * tileWidth;
+        const tile = new Tile_1.default(tiledTile, tileset);
+        tile.x = x * tilewidth;
         tile.y =
-            y * tileHeight +
-                (tileHeight -
+            y * tileheight +
+                (tileheight -
                     tile.texture.height);
         tile._x = x;
         tile._y = y;
-        if (tileset.tileOffset) {
-            tile.x += tileset.tileOffset.x;
-            tile.y += tileset.tileOffset.y;
+        if (tileset.tileoffset) {
+            tile.x += (_a = tileset.tileoffset.x) !== null && _a !== void 0 ? _a : 0;
+            tile.y += (_b = tileset.tileoffset.y) !== null && _b !== void 0 ? _b : 0;
         }
         if (filter) {
             const ret = filter(tile);
@@ -64,10 +61,10 @@ class TileLayer extends PIXI.Container {
     }
     /** @internal */
     changeTile(x, y) {
-        const { tileWidth, tileHeight } = this.layer.map.data;
-        x = Math.floor(x / tileWidth);
-        y = Math.floor(y / tileHeight);
-        const oldTile = this.tiles[x + ';' + y];
+        const { tilewidth, tileheight } = this.map.getData();
+        x = Math.floor(x / tilewidth);
+        y = Math.floor(y / tileheight);
+        const oldTile = this._tiles[x + ';' + y];
         const newTile = this.createTile(x, y);
         if (!oldTile && newTile) {
             this.addFrame(newTile, x, y);
@@ -77,7 +74,7 @@ class TileLayer extends PIXI.Container {
                 const bufComposite = new pixi_tilemap_1.pixi_tilemap.CompositeRectTileLayer();
                 const frame = bufComposite.addFrame(newTile.texture, newTile.x, newTile.y);
                 newTile.setAnimation(frame);
-                this.tiles[x + ';' + y] = newTile;
+                this._tiles[x + ';' + y] = newTile;
                 const pointsBufComposite = bufComposite.children[0].pointsBuf;
                 [0, 1, 4, 5, 6, 7].forEach((i) => {
                     if (this.pointsBuf)
@@ -86,7 +83,7 @@ class TileLayer extends PIXI.Container {
                 this.tilemap.children[0].modificationMarker = 0;
             }
             else {
-                delete this.tiles[x + ';' + y];
+                delete this._tiles[x + ';' + y];
                 if (this.pointsBuf)
                     this.pointsBuf.splice(oldTile.pointsBufIndex, pixi_tilemap_1.POINT_STRUCT_SIZE);
             }
@@ -106,12 +103,12 @@ class TileLayer extends PIXI.Container {
             return null;
         tile.pointsBufIndex = pb.length - pixi_tilemap_1.POINT_STRUCT_SIZE;
         tile.setAnimation(frame);
-        this.tiles[x + ';' + y] = tile;
+        this._tiles[x + ';' + y] = tile;
     }
     /** @internal */
     create() {
         this.tilemap = new pixi_tilemap_1.pixi_tilemap.CompositeRectTileLayer();
-        const { width, height } = this.layer.map.data;
+        const { width, height } = this.map.getData();
         for (let y = 0; y < height; y++) {
             for (let x = 0; x < width; x++) {
                 const tile = this.createTile(x, y);

package/lib/Tilemap/TileLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"TileLayer.js","sourceRoot":"","sources":["../../src/Tilemap/TileLayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TileLayer.js","sourceRoot":"","sources":["../../src/Tilemap/TileLayer.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,+CAAsF;AAItF,+CAA4C;AAE5C,2BAAY,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAA;AACrC,2BAAY,CAAC,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAA;AAS1C,MAAqB,SAAU,SAAQ,yBAAW;IAgB9C,YAAY,KAAY,EAAU,QAAmB,EAAE,GAAY;QAC/D,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QADa,aAAQ,GAAR,QAAQ,CAAW;QAd7C,WAAM,GAAQ,EAAE,CAAA;IAgBxB,CAAC;IAbD,MAAM,CAAC,WAAW,CAAC,GAAW,EAAE,QAAmB;QAC/C,IAAI,OAA4B,CAAA;QAChC,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YACrB,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAG,EAAE;gBAC7C,MAAM;aACT;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAMD,gBAAgB;IAChB,UAAU,CAAC,CAAS,EAAE,CAAS,EAAE,UAAe,EAAE;;QAC9C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAChC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QAC3D,IAAI,IAAI,EAAE;YACN,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;YAC7B,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAC,CAAA;SACjC;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAErC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;YAAE,OAAM;QAE3D,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CACjC,SAAS,CAAC,GAAG,EACb,IAAI,CAAC,QAAQ,CAChB,CAAA;QAED,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,MAAM,IAAI,GAAG,IAAI,cAAI,CACjB,SAAS,EACT,OAAO,CACV,CAAA;QAED,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,CAAC;YACF,CAAC,GAAG,UAAU;gBACd,CAAC,UAAU;oBACP,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7B,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QAEZ,IAAI,OAAO,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,CAAC,IAAI,MAAA,OAAO,CAAC,UAAU,CAAC,CAAC,mCAAI,CAAC,CAAC;YACpC,IAAI,CAAC,CAAC,IAAI,MAAA,OAAO,CAAC,UAAU,CAAC,CAAC,mCAAI,CAAC,CAAC;SACvC;QAED,IAAI,MAAM,EAAE;YACR,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;YACxB,IAAI,CAAC,GAAG;gBAAE,OAAM;SACnB;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,gBAAgB;IAChB,UAAU,CAAC,CAAS,EAAE,CAAS;QAC3B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QACpD,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;QAC7B,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAC,CAAA;QAC9B,MAAM,OAAO,GAAS,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAA;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACrC,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE;YACrB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;SAC/B;aACI;YACD,IAAI,OAAO,EAAE;gBACT,MAAM,YAAY,GAAqB,IAAI,2BAAY,CAAC,sBAAsB,EAAsB,CAAA;gBACpG,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;gBAC1E,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;gBAC3B,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,CAAA;gBAClC,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAE5D;gBAAA,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC9B,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,GAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;gBACxF,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,GAAG,CAAC,CAAA;aAClD;iBACI;gBACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAA;gBAC/B,IAAI,IAAI,CAAC,SAAS;oBAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,gCAAiB,CAAC,CAAA;aACvF;SACJ;IACL,CAAC;IAED,gBAAgB;IAChB,IAAI,SAAS;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAA;QACvB,OAAO,KAAK,CAAC,SAAS,CAAA;IAC1B,CAAC;IAEO,QAAQ,CAAC,IAAU,EAAE,CAAS,EAAE,CAAS;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;QACjE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAA;QACzB,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAA;QACpB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,MAAM,GAAG,gCAAiB,CAAA;QACnD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACxB,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAA;IACnC,CAAC;IAED,gBAAgB;IAChB,MAAM;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,2BAAY,CAAC,sBAAsB,EAAsB,CAAA;QAC5E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAClC,IAAI,IAAI,EAAE;oBACN,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;iBAC5B;aACJ;SACJ;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAc,CAAC,CAAA;IACtC,CAAC;CACJ;AA9HD,4BA8HC"}

package/lib/Tilemap/TileSet.d.ts

@@ -1,17 +1,6 @@
-export default class TileSet {
-    firstGid: number;
-    margin: number;
-    spacing: number;
-    tileHeight: number;
-    tileWidth: number;
-    image: {
-        width: number;
-        height: number;
-    };
-    tileOffset: any;
-    name: string;
+import { TiledTileset, Tileset as TiledTilesetClass } from '@rpgjs/tiled';
+export default class TileSet extends TiledTilesetClass {
     private baseTexture;
-    spritesheet: any;
-    private textures;
-    constructor(tileSet: any);
+    textures: PIXI.Texture[];
+    constructor(tileSet: TiledTileset);
 }

package/lib/Tilemap/TileSet.js

@@ -1,31 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Spritesheets_1 = require("../Sprite/Spritesheets");
+const tiled_1 = require("@rpgjs/tiled");
 const Logger_1 = require("../Logger");
-class TileSet {
+class TileSet extends tiled_1.Tileset {
     constructor(tileSet) {
-        this.firstGid = 0;
-        this.margin = 0;
-        this.spacing = 0;
-        this.tileHeight = 0;
-        this.tileWidth = 0;
-        this.tileOffset = {};
-        this.name = '';
+        super(tileSet);
         this.textures = [];
-        Object.assign(this, tileSet);
-        const spritesheet = Spritesheets_1.spritesheets.get(this.name);
-        if (!spritesheet) {
-            throw Logger_1.log(`There are no tilesets for ${this.name}`);
-        }
-        this.spritesheet = spritesheet;
     }
     /** @internal */
     load() {
-        const { texture } = this.spritesheet.resource;
+        const spritesheet = Spritesheets_1.spritesheets.get(this.name);
+        if (!spritesheet) {
+            throw (0, Logger_1.log)(`Impossible to find ${this.name} tileset`);
+        }
+        const { texture } = spritesheet.resource;
         this.baseTexture = texture.baseTexture;
-        for (let y = this.margin; y < this.image.height; y += this.tileHeight + this.spacing) {
-            for (let x = this.margin; x < this.image.width; x += this.tileWidth + this.spacing) {
-                this.textures.push(new PIXI.Texture(this.baseTexture, new PIXI.Rectangle(+x, +y, +this.tileWidth, +this.tileHeight)));
+        for (let y = this.margin; y < this.image.height; y += this.tileheight + this.spacing) {
+            for (let x = this.margin; x < this.image.width; x += this.tilewidth + this.spacing) {
+                this.textures.push(new PIXI.Texture(this.baseTexture, new PIXI.Rectangle(+x, +y, +this.tilewidth, +this.tileheight)));
             }
         }
     }

package/lib/Tilemap/TileSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"TileSet.js","sourceRoot":"","sources":["../../src/Tilemap/TileSet.ts"],"names":[],"mappings":";;AAAA,yDAAqD;AACrD,sCAA+B;AAE/B,MAAqB,OAAO;IAiBxB,YAAY,OAAO;QAfnB,aAAQ,GAAW,CAAC,CAAA;QACpB,WAAM,GAAW,CAAC,CAAA;QAClB,YAAO,GAAU,CAAC,CAAA;QAClB,eAAU,GAAW,CAAC,CAAA;QACtB,cAAS,GAAU,CAAC,CAAA;QAKpB,eAAU,GAAQ,EAAE,CAAA;QACpB,SAAI,GAAW,EAAE,CAAA;QAGT,aAAQ,GAAmB,EAAE,CAAA;QAGjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC5B,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,YAAG,CAAC,6BAA6B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;SACtD;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAClC,CAAC;IAED,gBAAgB;IAChB,IAAI;QACA,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAA;QAC7C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QACtC,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EACrB,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,EACrC;YACE,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EACpB,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,EACpC;gBACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,IAAI,CAAC,OAAO,CACZ,IAAI,CAAC,WAAW,EAChB,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAChE,CACJ,CAAA;aACJ;SACJ;IACL,CAAC;CACJ;AAjDD,0BAiDC"}
+{"version":3,"file":"TileSet.js","sourceRoot":"","sources":["../../src/Tilemap/TileSet.ts"],"names":[],"mappings":";;AAAA,yDAAqD;AACrD,wCAAyE;AACzE,sCAA+B;AAE/B,MAAqB,OAAQ,SAAQ,eAAiB;IAIlD,YAAY,OAAqB;QAC7B,KAAK,CAAC,OAAO,CAAC,CAAA;QAHX,aAAQ,GAAmB,EAAE,CAAA;IAIpC,CAAC;IAED,gBAAgB;IAChB,IAAI;QACA,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,IAAA,YAAG,EAAC,sBAAsB,IAAI,CAAC,IAAI,UAAU,CAAC,CAAA;SACvD;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QACtC,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EACrB,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,EACrC;YACE,KACI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EACnB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EACpB,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,EACpC;gBACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CACd,IAAI,IAAI,CAAC,OAAO,CACZ,IAAI,CAAC,WAAW,EAChB,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAChE,CACJ,CAAA;aACJ;SACJ;IACL,CAAC;CACJ;AAnCD,0BAmCC"}

package/lib/Tilemap/index.d.ts

@@ -1,28 +1,35 @@
 import ImageLayer from './ImageLayer';
 import TileLayer from './TileLayer';
 import TileSet from './TileSet';
+import { TiledMap, Layer } from '@rpgjs/tiled';
+import { RpgRenderer } from '../Renderer';
+export interface MapInfo extends TiledMap {
+    layers: Layer[];
+}
 export default class TileMap extends PIXI.Container {
+    private data;
     private renderer;
     background: PIXI.Graphics;
     eventsLayers: {
         [eventLayerName: string]: PIXI.Container;
     };
-    defaultLayer: PIXI.Container | null;
-    data: any;
+    defaultLayer: PIXI.Container;
     private _width;
     private _height;
-    tileWidth: number;
-    tileHeight: number;
+    tilewidth: number;
+    tileheight: number;
     private frameRateAnimation;
-    tileSets: TileSet[];
+    tilesets: TileSet[];
     layers: {
         [layerName: string]: TileLayer | ImageLayer;
     };
-    shapeLayer: PIXI.Container;
     private tilesLayer;
     private frameTile;
-    constructor(data: any, renderer: any);
-    getEventLayer(name?: string): PIXI.Container | null;
-    createEventLayer(name: any): PIXI.Container;
+    static readonly EVENTS_LAYER_DEFAULT: string;
+    constructor(data: MapInfo, renderer: RpgRenderer);
+    getEventLayer(objectName?: string): PIXI.Container;
+    createEventLayer(name: string): PIXI.Container;
+    getData(): MapInfo;
+    setBackgroundColor(color: string): void;
     private create;
 }

package/lib/Tilemap/index.js

@@ -8,23 +8,23 @@ const ImageLayer_1 = __importDefault(require("./ImageLayer"));
 const TileLayer_1 = __importDefault(require("./TileLayer"));
 const TileSet_1 = __importDefault(require("./TileSet"));
 const Logger_1 = require("../Logger");
+const tiled_1 = require("@rpgjs/tiled");
 const { intersection } = common_1.Utils;
 PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST;
 class TileMap extends PIXI.Container {
     constructor(data, renderer) {
         super();
+        this.data = data;
         this.renderer = renderer;
         this.background = new PIXI.Graphics();
         this.eventsLayers = {};
-        this.defaultLayer = null;
         this._width = 0;
         this._height = 0;
-        this.tileWidth = 0;
-        this.tileHeight = 0;
+        this.tilewidth = 0;
+        this.tileheight = 0;
         this.frameRateAnimation = 10;
-        this.tileSets = [];
+        this.tilesets = [];
         this.layers = {};
-        this.shapeLayer = new PIXI.Container();
         this.tilesLayer = new PIXI.Container();
         this.frameTile = 0;
         this.x = 0;
@@ -34,27 +34,45 @@ class TileMap extends PIXI.Container {
     /** @internal */
     drawAnimateTile(frame) {
         if (frame % this.frameRateAnimation == 0) {
-            this.renderer.renderer.plugins.tilemap.tileAnim[0] = this.frameTile;
+            this.renderer['renderer'].plugins.tilemap.tileAnim[0] = this.frameTile;
             this.frameTile++;
         }
     }
-    getEventLayer(name) {
-        return name ? this.eventsLayers[name] : this.defaultLayer;
+    getEventLayer(objectName) {
+        for (let layerData of this.data.layers) {
+            if (layerData.type != tiled_1.TiledLayerType.ObjectGroup) {
+                continue;
+            }
+            for (let object of layerData.objects) {
+                if (object.name == objectName) {
+                    return this.eventsLayers[layerData.name];
+                }
+            }
+        }
+        return this.defaultLayer;
     }
     createEventLayer(name) {
         const container = this.eventsLayers[name] = new PIXI.Container();
         container.sortableChildren = true;
-        this.addChild(container);
+        this.tilesLayer.addChild(container);
         return container;
     }
+    getData() {
+        return this.data;
+    }
+    setBackgroundColor(color) {
+        color = color.replace('#', '');
+        this.background.beginFill(parseInt(color, 16));
+        this.background.drawRect(0, 0, (this._width || 0) * (this.tilewidth || 0), (this._height || 0) * (this.tileheight || 0));
+        this.background.endFill();
+    }
     create(data) {
         this.data = data;
         Object.assign(this, data);
-        this.background.beginFill(0x00000);
-        this.background.drawRect(0, 0, (this._width || 0) * (this.tileWidth || 0), (this._height || 0) * (this.tileHeight || 0));
-        this.background.endFill();
+        if (this.data.backgroundcolor)
+            this.setBackgroundColor(this.data.backgroundcolor);
         this.addChild(this.background);
-        this.tileSets = this.tileSets.map((tileSet) => {
+        this.tilesets = this.data.tilesets.map((tileSet) => {
             return new TileSet_1.default(tileSet);
         });
     }
@@ -63,14 +81,14 @@ class TileMap extends PIXI.Container {
         const tilesLayer = [];
         this.data.layers.forEach((layerData) => {
             switch (layerData.type) {
-                case 'tile': {
-                    const tileLayer = new TileLayer_1.default(layerData, this.tileSets);
+                case tiled_1.TiledLayerType.Tile: {
+                    const tileLayer = new TileLayer_1.default(layerData, this.tilesets, this);
                     const tile = tileLayer.createTile(x, y, {
                         real: true,
                         filter: (tile) => {
                             const { data, y: yObject, z: zObject } = instance;
                             const { hHitbox, height } = data;
-                            const zLayer = tileLayer.properties.z;
+                            const zLayer = tileLayer.z;
                             const tileHasZ = tile.properties.z !== undefined;
                             let { z } = tile.properties;
                             if (zLayer !== undefined) {
@@ -123,45 +141,46 @@ class TileMap extends PIXI.Container {
     changeTile(x, y, layerName) {
         const layer = this.layers[layerName];
         if (!layer)
-            throw Logger_1.log(`${layerName} not exists`);
+            throw (0, Logger_1.log)(`${layerName} not exists`);
         if (layer instanceof TileLayer_1.default) {
             layer.changeTile(x, y);
         }
     }
     /** @internal */
     load(options) {
-        this.defaultLayer = null;
         this.tilesLayer.removeChildren();
-        this.tileSets.forEach(tileset => tileset.load());
+        this.tilesets.forEach(tileset => tileset.load());
         this.data.layers.forEach((layerData) => {
-            layerData.map = this;
             switch (layerData.type) {
-                case 'tile': {
-                    const tileLayer = new TileLayer_1.default(layerData, this.tileSets);
+                case tiled_1.TiledLayerType.Tile: {
+                    const tileLayer = new TileLayer_1.default(layerData, this.tilesets, this);
                     if (options === null || options === void 0 ? void 0 : options.drawTiles)
                         tileLayer.create();
                     this.layers[layerData.name] = tileLayer;
                     this.tilesLayer.addChild(tileLayer);
                     break;
                 }
-                case 'image': {
-                    const imageLayer = new ImageLayer_1.default(layerData);
+                case tiled_1.TiledLayerType.Image: {
+                    const imageLayer = new ImageLayer_1.default(layerData, this);
                     this.layers[layerData.name] = imageLayer;
                     this.tilesLayer.addChild(imageLayer);
                     break;
                 }
-                case 'object': {
-                    // this.defaultLayer = this.createEventLayer(layerData.name)
+                case tiled_1.TiledLayerType.ObjectGroup: {
+                    const layer = this.createEventLayer(layerData.name);
+                    if (layerData.properties[TileMap.EVENTS_LAYER_DEFAULT]) {
+                        this.defaultLayer = layer;
+                    }
                     break;
                 }
             }
         });
         this.addChild(this.tilesLayer);
         if (!this.defaultLayer) {
-            this.defaultLayer = this.createEventLayer('event-layer');
+            this.defaultLayer = this.createEventLayer(TileMap.EVENTS_LAYER_DEFAULT);
         }
-        this.addChild(this.shapeLayer);
     }
 }
 exports.default = TileMap;
+TileMap.EVENTS_LAYER_DEFAULT = 'events-layer-default';
 //# sourceMappingURL=index.js.map

package/lib/Tilemap/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Tilemap/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Tilemap/index.ts"],"names":[],"mappings":"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"}