@rpgjs/client 3.0.0-beta.7 → 3.0.0-rc

package/lib/Sprite/Character.js

@@ -6,103 +6,19 @@ const Animation_1 = require("../Effects/Animation");
 const AnimationCharacter_1 = require("../Effects/AnimationCharacter");
 const { capitalize } = common_1.Utils;
 class Character extends PIXI.Sprite {
-    constructor(data, scene) {
+    constructor(component, graphic) {
         super();
-        this.data = data;
-        this.scene = scene;
+        this.component = component;
+        this.graphic = graphic;
+        this.playStandardAnimation = true;
+        this.objSaved = {};
+        this.data = {};
         /** @internal */
         this.h = 1;
         /** @internal */
         this.w = 1;
-        this.direction = 0;
-        this.graphic = '';
-        this._x = 0;
-        this._y = 0;
-        this.z = 0;
-        this.fixed = false;
-        this.playStandardAnimation = true;
-        this.objSaved = {};
-        this.teleported = 0;
-        this.map = '';
-        this.x = data.position.x;
-        this.y = data.position.y;
-        this.fixed = data.fixed;
-    }
-    /**
-    * the direction of the sprite
-    *
-    * @prop {Direction} dir
-    * @readonly
-    * @memberof RpgSprite
-    * */
-    get dir() {
-        return this.direction;
-    }
-    /**
-     * To know if the sprite is a player
-     *
-     * @prop {boolean} isPlayer
-     * @readonly
-     * @memberof RpgSprite
-     * */
-    get isPlayer() {
-        return this.data.type == 'player';
-    }
-    /**
-     * To know if the sprite is an event
-     *
-     * @prop {boolean} isEvent
-     * @readonly
-     * @memberof RpgSprite
-     * */
-    get isEvent() {
-        return this.data.type == 'event';
-    }
-    /**
-     * To know if the sprite is the sprite controlled by the player
-     *
-     * @prop {boolean} isCurrentPlayer
-     * @readonly
-     * @memberof RpgSprite
-     * */
-    get isCurrentPlayer() {
-        return this.data.playerId === this.scene.game.playerId;
-    }
-    /**
-     * Retrieves the logic of the sprite
-     *
-     * @prop {RpgSpriteLogic} logic
-     * @readonly
-     * @since 3.0.0-beta.4
-     * @memberof RpgSprite
-     * */
-    get logic() {
-        return this.scene.game.world.getObject(this.data.playerId);
-    }
-    get guiDisplay() {
-        return this.logic.guiDisplay;
-    }
-    set guiDisplay(val) {
-        this.logic.guiDisplay = val;
-    }
-    /**
-     * Recover the position according to the graphic
-     * Normally, the position is that of the hitbox but, we retrieve the top left corner of the graphic
-     *
-     * You can also pass the `middle` value as first parameter to retrieve the positions from the middle of the sprite
-     *
-     * @title Get Positions of Graphic
-     * @method sprite.getPositionsOfGraphic(align)
-     * @param {string} [align] middle
-     * @returns { x: number, y: number }
-     * @memberof RpgSprite
-     */
-    getPositionsOfGraphic(align) {
-        const isMiddle = align == 'middle';
-        return {
-            x: this.x - this.w * this.anchor.x + (isMiddle ? this.w / 2 : 0),
-            y: this.y - this.h * this.anchor.y + (isMiddle ? this.h / 2 : 0)
-        };
+        this.data = component.logic;
+        this.setGraphic(graphic);
     }
     /** @internal */
     showAnimation(graphic, animationName) {
@@ -113,7 +29,14 @@ class Character extends PIXI.Sprite {
             this.setAnimationAnchor();
         };
         const memoryGraphic = this.graphic;
-        refreshAnimation(graphic);
+        let graphicId = '';
+        if (common_1.Utils.isArray(graphic)) {
+            graphicId = graphic.find(id => id == this.graphic);
+        }
+        else {
+            graphicId = graphic;
+        }
+        refreshAnimation(graphicId);
         this.animation.onFinish = () => {
             this.playStandardAnimation = true;
             refreshAnimation(memoryGraphic);
@@ -151,45 +74,12 @@ class Character extends PIXI.Sprite {
         };
     }
     /** @internal */
-    update(obj) {
-        const { graphic, speed, teleported, map } = obj;
-        if (graphic != this.graphic) {
-            this.setGraphic(graphic);
-        }
+    update(obj, options = {}) {
+        const { graphic, direction } = obj;
+        const { moving } = options;
+        this.data = obj;
         if (this.anim)
             this.anim.update();
-        let moving = false;
-        if (!this.fixed) {
-            this.z = Math.floor(obj.position.z);
-            this._x = Math.floor(obj.position.x);
-            this._y = Math.floor(obj.position.y) - this.z;
-            if (teleported != this.teleported || map != this.map) {
-                this.x = this._x;
-                this.y = this._y;
-                this.teleported = teleported;
-                this.map = map;
-            }
-            this.parent.parent.zIndex = this._y;
-            obj.posX = obj.position.x;
-            obj.posY = obj.position.y;
-            this.direction = obj.direction;
-            if (this._x > this.x) {
-                this.x += Math.min(speed, this._x - this.x);
-                moving = true;
-            }
-            if (this._x < this.x) {
-                this.x -= Math.min(speed, this.x - this._x);
-                moving = true;
-            }
-            if (this._y > this.y) {
-                this.y += Math.min(speed, this._y - this.y);
-                moving = true;
-            }
-            if (this._y < this.y) {
-                this.y -= Math.min(speed, this.y - this._y);
-                moving = true;
-            }
-        }
         if (this.animation)
             this.animation.update();
         if (this.playStandardAnimation) {
@@ -201,7 +91,6 @@ class Character extends PIXI.Sprite {
                 this.playAnimation(AnimationCharacter_1.Animation.Stand);
             }
         }
-        this.onUpdate(obj);
         this.objSaved = obj;
         return {
             moving,
@@ -217,14 +106,10 @@ class Character extends PIXI.Sprite {
             this.spritesheet[hook](this);
         }
         else if (this.animation.has(name)) {
-            this.animation.play(name, [this.dir]);
+            this.animation.play(name, [this.data.direction]);
         }
     }
-    // Hooks
-    onInit() { }
-    onUpdate(obj) { }
-    onMove() { }
-    onChanges(data, old) { }
 }
 exports.default = Character;
+Character.id = 'graphic';
 //# sourceMappingURL=Character.js.map

package/lib/Sprite/Character.js.map

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

package/lib/Sprite/Spritesheets.js

@@ -4,7 +4,7 @@ exports._initSpritesheet = exports.spritesheets = void 0;
 const Resources_1 = require("../Resources");
 exports.spritesheets = new Map();
 function _initSpritesheet(_spritesheets, engine) {
-    return Resources_1._initResource(exports.spritesheets, _spritesheets, 'image', engine);
+    return (0, Resources_1._initResource)(exports.spritesheets, _spritesheets, 'image', engine);
 }
 exports._initSpritesheet = _initSpritesheet;
 //# sourceMappingURL=Spritesheets.js.map

package/lib/Sprite/Spritesheets.js.map

@@ -1 +1 @@
-{"version":3,"file":"Spritesheets.js","sourceRoot":"","sources":["../../src/Sprite/Spritesheets.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE/B,QAAA,YAAY,GAAqB,IAAI,GAAG,EAAE,CAAA;AAEvD,SAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM;IAClD,OAAO,yBAAa,CAAC,oBAAY,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;AACtE,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"Spritesheets.js","sourceRoot":"","sources":["../../src/Sprite/Spritesheets.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE/B,QAAA,YAAY,GAAqB,IAAI,GAAG,EAAE,CAAA;AAEvD,SAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM;IAClD,OAAO,IAAA,yBAAa,EAAC,oBAAY,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;AACtE,CAAC;AAFD,4CAEC"}

package/lib/Tilemap/CommonLayer.d.ts

@@ -0,0 +1,8 @@
+import { Layer } from "@rpgjs/tiled";
+import TileMap from './index';
+export declare class CommonLayer extends PIXI.Container {
+    protected layer: Layer;
+    protected map: TileMap;
+    constructor(layer: Layer, map: TileMap);
+    applyProperties(): void;
+}

package/lib/Tilemap/CommonLayer.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommonLayer = void 0;
+class CommonLayer extends PIXI.Container {
+    constructor(layer, map) {
+        super();
+        this.layer = layer;
+        this.map = map;
+        this.applyProperties();
+    }
+    applyProperties() {
+        var _a, _b, _c, _d;
+        this.alpha = (_a = this.layer.opacity) !== null && _a !== void 0 ? _a : 1;
+        this.visible = (_b = this.layer.visible) !== null && _b !== void 0 ? _b : true;
+        this.x = (_c = this.layer.offsetx) !== null && _c !== void 0 ? _c : 0;
+        this.y = (_d = this.layer.offsety) !== null && _d !== void 0 ? _d : 0;
+    }
+}
+exports.CommonLayer = CommonLayer;
+//# sourceMappingURL=CommonLayer.js.map

package/lib/Tilemap/CommonLayer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CommonLayer.js","sourceRoot":"","sources":["../../src/Tilemap/CommonLayer.ts"],"names":[],"mappings":";;;AAGA,MAAa,WAAY,SAAQ,IAAI,CAAC,SAAS;IAC3C,YAAsB,KAAY,EAAY,GAAY;QACtD,KAAK,EAAE,CAAA;QADW,UAAK,GAAL,KAAK,CAAO;QAAY,QAAG,GAAH,GAAG,CAAS;QAEtD,IAAI,CAAC,eAAe,EAAE,CAAA;IACxB,CAAC;IAEH,eAAe;;QACX,IAAI,CAAC,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,CAAC,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAA;QACzC,IAAI,CAAC,CAAC,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,CAAC,CAAA;QAChC,IAAI,CAAC,CAAC,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,mCAAI,CAAC,CAAA;IACpC,CAAC;CACJ;AAZD,kCAYC"}

package/lib/Tilemap/ImageLayer.d.ts

@@ -1,3 +1,4 @@
-export default class ImageLayer extends PIXI.Container {
-    constructor(layer: any);
+import { CommonLayer } from './CommonLayer';
+export default class ImageLayer extends CommonLayer {
+    applyProperties(): void;
 }

package/lib/Tilemap/ImageLayer.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class ImageLayer extends PIXI.Container {
-    constructor(layer) {
-        super();
-        Object.assign(this, layer);
-        this.alpha = layer.opacity;
-        if (layer.image && layer.image.source) {
-            this.addChild(PIXI.Sprite.from(`${layer.image.source}`));
+const CommonLayer_1 = require("./CommonLayer");
+class ImageLayer extends CommonLayer_1.CommonLayer {
+    applyProperties() {
+        super.applyProperties();
+        const engine = this.map['renderer']['clientEngine'];
+        if (this.layer.image && this.layer.image.source && engine) {
+            const { width, height, source } = this.layer.image;
+            const data = this.map.getData();
+            const texture = PIXI.Texture.from(engine.getResourceUrl(source));
+            const tilingSprite = new PIXI.TilingSprite(texture, this.layer.repeatx ? data.width * data.tilewidth : width, this.layer.repeaty ? data.height * data.tileheight : height);
+            this.addChild(tilingSprite);
         }
     }
 }

package/lib/Tilemap/ImageLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImageLayer.js","sourceRoot":"","sources":["../../src/Tilemap/ImageLayer.ts"],"names":[],"mappings":";;AAAA,MAAqB,UAAW,SAAQ,IAAI,CAAC,SAAS;IACpD,YAAY,KAAK;QACf,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAA;QAC1B,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SAC1D;IACH,CAAC;CACF;AATD,6BASC"}
+{"version":3,"file":"ImageLayer.js","sourceRoot":"","sources":["../../src/Tilemap/ImageLayer.ts"],"names":[],"mappings":";;AAAA,+CAA4C;AAE5C,MAAqB,UAAW,SAAQ,yBAAW;IACjD,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAA;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,CAAA;QACnD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,EAAE;YACzD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;YAClD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;YAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAA;YAChE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,YAAY,CACtC,OAAO,EACP,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAC9D,CAAA;YACD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;SAC5B;IACH,CAAC;CACF;AAhBD,6BAgBC"}

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,21 @@
 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,21 @@ 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.properties = {};
+        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 +27,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 +62,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 +75,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 +84,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 +104,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);