@safe-engine/pixi 8.9.2 → 8.9.4

package/dist/base/EnhancedComponent.d.ts

@@ -7,7 +7,7 @@ export declare class EnhancedComponent<Props = object, N extends NodeComp<Contai
     private _ticker;
     private _timers;
     constructor(data?: BaseComponentProps<EnhancedComponent> & Props);
-    init(data?: Props): void;
+    _init(data?: Props): void;
     node: N;
     addComponent<T extends EnhancedComponent>(instance: T): T;
     getComponent<T extends ComponentType>(component: Constructor<T>): T;

package/dist/base/EnhancedComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAU,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;IAChG,KAAK,EAAE,KAAK,CAAY;IACxB,OAAO,UAAO;IACd,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAe;gBAElB,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAKhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IAQjB,IAAI,EAAE,CAAC,CAAA;IAEP,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,QAAQ,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,EAAE,MAAM,SAAiB,EAAE,KAAK,SAAI;IAwB/D,YAAY,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,GAAG,MAAY;IAsB7C,UAAU,CAAC,QAAQ,KAAA;IAQnB,sBAAsB;IAMtB,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAU,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;IAChG,KAAK,EAAE,KAAK,CAAY;IACxB,OAAO,UAAO;IACd,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAe;gBAElB,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAKhE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK;IAQlB,IAAI,EAAE,CAAC,CAAA;IAEP,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,QAAQ,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,EAAE,MAAM,SAAiB,EAAE,KAAK,SAAI;IAwB/D,YAAY,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,GAAG,MAAY;IAsB7C,UAAU,CAAC,QAAQ,KAAA;IAQnB,sBAAsB;IAMtB,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}

package/dist/base/EnhancedComponent.js

@@ -4,11 +4,11 @@ export class EnhancedComponent {
     constructor(data) {
         this.props = {};
         this.enabled = true;
-        this.init(data);
+        this._init(data);
         this._ticker = Ticker.shared;
         this._timers = new Map(); // Map<Function, TimerInfo>
     }
-    init(data) {
+    _init(data) {
         if (data) {
             // console.log('constructor', this.constructor.name, data)
             Object.keys(data).forEach((key) => {

package/dist/base/utils.d.ts

@@ -1,6 +1,7 @@
 import { Constructor } from 'entityx-ts';
+import { SceneComponent } from '..';
 import { ComponentX } from '../components/BaseComponent';
 export type GetProps<T> = T extends ComponentX<infer P> ? P : never;
 export declare function instantiate<T extends ComponentX>(ComponentType: Constructor<T>, data?: GetProps<T>): T;
-export declare function loadScene<T extends ComponentX>(ComponentType: Constructor<T>): void;
+export declare function loadScene<T extends SceneComponent>(ComponentType: Constructor<T>): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/base/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGxC,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEnE,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAOtG;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,QAK5E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAa,cAAc,EAAE,MAAM,IAAI,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEnE,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAOtG;AAED,wBAAsB,SAAS,CAAC,CAAC,SAAS,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,iBAQtF"}

package/dist/base/utils.js

@@ -1,15 +1,29 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { GameWorld } from '..';
 export function instantiate(ComponentType, data) {
     const instance = new ComponentType();
-    instance.init(data);
+    instance._init(data);
     if (!instance.render) {
         return instance;
     }
     return instance.render();
 }
 export function loadScene(ComponentType) {
-    const world = GameWorld.Instance;
-    world.entities.reset();
-    const instance = new ComponentType();
-    instance.render();
+    return __awaiter(this, void 0, void 0, function* () {
+        const world = GameWorld.Instance;
+        world.entities.reset();
+        const instance = new ComponentType();
+        if (instance.preLoad) {
+            yield instance.preLoad();
+        }
+        instance.render();
+    });
 }

package/dist/components/Scene.d.ts

@@ -1,6 +1,7 @@
 import { EnhancedComponent } from '../base';
 import { NodeComp } from './NodeComp';
 export declare class SceneComponent extends EnhancedComponent<object, NodeComp> {
+    preLoad: () => Promise<void>;
     render(): this;
 }
 //# sourceMappingURL=Scene.d.ts.map

package/dist/components/Scene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/components/Scene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC;IACrE,MAAM;CAWP"}
+{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/components/Scene.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC;IACrE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,MAAM;CAWP"}

package/dist/tiledmap/TiledMapComp.d.ts

@@ -1,30 +1,12 @@
-import { Tilemap } from '@pixi/tilemap';
-import { BaseComponentProps, Vec2 } from '..';
+import { BaseComponentProps } from '..';
 import { ComponentX } from '../components/BaseComponent';
+import { TiledMapContainer } from './TiledMapContainer';
 interface TiledMapCompProps extends BaseComponentProps<TiledMapComp> {
     mapFile: string;
 }
-export declare class TiledMapComp extends ComponentX<TiledMapCompProps, Tilemap> {
-    mapData: any;
-    getPositionAt(tx: number, ty: number): {
-        x: number;
-        y: number;
-        equals(other: /*elided*/ any): boolean;
-        add(value: import("pixi.js/lib/maths/point/Point").Point | Vec2): /*elided*/ any;
-        addSelf(value: import("pixi.js/lib/maths/point/Point").Point | Vec2): /*elided*/ any;
-        sub(value: import("pixi.js/lib/maths/point/Point").Point | Vec2): /*elided*/ any;
-        mul(multiply: number): /*elided*/ any;
-        mulSelf(multiply: number): /*elided*/ any;
-        mag(): number;
-        normalizeSelf(): /*elided*/ any;
-        normalize(): /*elided*/ any;
-        cross(other: Vec2): number;
-        signAngle(other: Vec2): number;
-        lengthSqr(): number;
-        dot(other: Vec2): number;
-        angle(other: Vec2): number;
-        distance(other: /*elided*/ any): number;
-    };
+export declare class TiledMapComp extends ComponentX<TiledMapCompProps, TiledMapContainer> {
+    getLayer(layerName: string): import("./TiledMapContainer").TiledMapLayer;
+    getObjectGroup(layerName: string): any;
     render(): this;
 }
 export {};

package/dist/tiledmap/TiledMapComp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TiledMapComp.d.ts","sourceRoot":"","sources":["../../src/tiledmap/TiledMapComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAU,kBAAkB,EAAuB,IAAI,EAAE,MAAM,IAAI,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAGxD,UAAU,iBAAkB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACtE,OAAO,EAAE,GAAG,CAAA;IAEZ,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAKpC,MAAM;CASP"}
+{"version":3,"file":"TiledMapComp.d.ts","sourceRoot":"","sources":["../../src/tiledmap/TiledMapComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuB,MAAM,IAAI,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,UAAU,iBAAkB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAChF,QAAQ,CAAC,SAAS,EAAE,MAAM;IAG1B,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,MAAM;CAQP"}

package/dist/tiledmap/TiledMapComp.js

@@ -1,13 +1,14 @@
-import { Assets, GameWorld, NodeComp, Vec2 } from '..';
+import { GameWorld, NodeComp } from '..';
 import { ComponentX } from '../components/BaseComponent';
-import { loadIsometricMap, tileToPixel } from './tield';
+import { loadIsometricMap } from './tield';
 export class TiledMapComp extends ComponentX {
-    getPositionAt(tx, ty) {
-        const pos = tileToPixel(this.mapData, tx + 1, ty);
-        return Vec2(pos);
+    getLayer(layerName) {
+        return this.node.instance.getLayer(layerName);
+    }
+    getObjectGroup(layerName) {
+        return this.node.instance.getObjectGroup(layerName);
     }
     render() {
-        this.mapData = Assets.get(this.props.mapFile);
         const tiledMap = loadIsometricMap(this.props.mapFile);
         const world = GameWorld.Instance;
         const entity = world.entities.create();

package/dist/tiledmap/TiledMapContainer.d.ts

@@ -0,0 +1,32 @@
+import { Container } from 'pixi.js';
+import { Vec2 } from '../core';
+export declare class TiledMapContainer extends Container {
+    layers: Map<string, TiledMapLayer>;
+    objectGroups: Map<string, any>;
+    getLayer(layerName: string): TiledMapLayer;
+    getObjectGroup(layerName: string): any;
+}
+export declare class TiledMapLayer extends Container {
+    mapData: any;
+    getPositionAt(tx: number, ty: number): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        addSelf(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        sub(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        mul(multiply: number): /*elided*/ any;
+        mulSelf(multiply: number): /*elided*/ any;
+        mag(): number;
+        normalizeSelf(): /*elided*/ any;
+        normalize(): /*elided*/ any;
+        cross(other: Vec2): number;
+        signAngle(other: Vec2): number;
+        lengthSqr(): number;
+        dot(other: Vec2): number;
+        angle(other: Vec2): number;
+        distance(other: /*elided*/ any): number;
+    };
+    getTileAt(tx: number, ty: number): import("pixi.js").ContainerChild;
+}
+//# sourceMappingURL=TiledMapContainer.d.ts.map

package/dist/tiledmap/TiledMapContainer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TiledMapContainer.d.ts","sourceRoot":"","sources":["../../src/tiledmap/TiledMapContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAG9B,qBAAa,iBAAkB,SAAQ,SAAS;IAC9C,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAY;IAC9C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAY;IAE1C,QAAQ,CAAC,SAAS,EAAE,MAAM;IAI1B,cAAc,CAAC,SAAS,EAAE,MAAM;CAGjC;AAED,qBAAa,aAAc,SAAQ,SAAS;IAC1C,OAAO,EAAE,GAAG,CAAA;IACZ,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAKpC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAIjC"}

package/dist/tiledmap/TiledMapContainer.js

@@ -0,0 +1,26 @@
+import { Container } from 'pixi.js';
+import { Vec2 } from '../core';
+import { tileToPixel } from './tield';
+export class TiledMapContainer extends Container {
+    constructor() {
+        super(...arguments);
+        this.layers = new Map();
+        this.objectGroups = new Map();
+    }
+    getLayer(layerName) {
+        return this.layers.get(layerName);
+    }
+    getObjectGroup(layerName) {
+        return this.objectGroups.get(layerName);
+    }
+}
+export class TiledMapLayer extends Container {
+    getPositionAt(tx, ty) {
+        const pos = tileToPixel(this.mapData, tx + 1, ty);
+        return Vec2(pos);
+    }
+    getTileAt(tx, ty) {
+        const idx = 0 | (tx + ty * this.mapData.width);
+        return this.children[idx];
+    }
+}

package/dist/tiledmap/tield.d.ts

@@ -1,7 +1,7 @@
-import { Tilemap } from '@pixi/tilemap';
+import { TiledMapContainer } from './TiledMapContainer';
 export declare function tileToPixel(map: any, tx: any, ty: any): {
     x: number;
     y: number;
 };
-export declare function loadIsometricMap(mapUrl: string): Tilemap;
+export declare function loadIsometricMap(mapUrl: string): TiledMapContainer;
 //# sourceMappingURL=tield.d.ts.map

package/dist/tiledmap/tield.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tield.d.ts","sourceRoot":"","sources":["../../src/tiledmap/tield.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGvC,wBAAgB,WAAW,CAAC,GAAG,KAAA,EAAE,EAAE,KAAA,EAAE,EAAE,KAAA;;;EA0BtC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAiC9C"}
+{"version":3,"file":"tield.d.ts","sourceRoot":"","sources":["../../src/tiledmap/tield.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,qBAAqB,CAAA;AAEtE,wBAAgB,WAAW,CAAC,GAAG,KAAA,EAAE,EAAE,KAAA,EAAE,EAAE,KAAA;;;EA0BtC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,qBAyC9C"}

package/dist/tiledmap/tield.js

@@ -1,5 +1,5 @@
-import { Tilemap } from '@pixi/tilemap';
-import { Assets, Rectangle, Texture } from 'pixi.js';
+import { Assets, Rectangle, Sprite, Texture } from 'pixi.js';
+import { TiledMapContainer, TiledMapLayer } from './TiledMapContainer';
 export function tileToPixel(map, tx, ty) {
     const tw = map.tilewidth;
     const th = map.tileheight;
@@ -35,10 +35,15 @@ export function loadIsometricMap(mapUrl) {
     const tileH = tileset.tileheight;
     const cols = tileset.columns;
     const firstGid = tileset.firstgid;
-    const tilemap = new Tilemap(baseTexture);
+    const tilemap = new TiledMapContainer();
+    // tilemap.mapData = mapData
     for (const layer of mapData.layers) {
         if (layer.type !== 'tilelayer')
             continue;
+        const tileLayer = new TiledMapLayer();
+        tileLayer.mapData = mapData;
+        tilemap.layers.set(layer.name, tileLayer);
+        tilemap.addChild(tileLayer);
         const data = layer.data;
         for (let i = 0; i < data.length; i++) {
             const gid = data[i];
@@ -51,7 +56,10 @@ export function loadIsometricMap(mapUrl) {
             const ty = Math.floor(i / mapData.width);
             const { x, y } = tileToPixel(mapData, tx, ty);
             const texture = new Texture({ source: baseTexture, frame: new Rectangle(frameX, frameY, tileW, tileH) });
-            tilemap.tile(texture, x, y);
+            const sprite = new Sprite(texture);
+            sprite.x = x;
+            sprite.y = y;
+            tileLayer.addChild(sprite);
         }
     }
     return tilemap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/pixi",
-  "version": "8.9.2",
+  "version": "8.9.4",
   "description": "safex pixi plugin",
   "type": "module",
   "main": "dist/index.js",