@safe-engine/pixi 8.9.1 → 8.9.3

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.1",
+  "version": "8.9.3",
   "description": "safex pixi plugin",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "@pixi/ui": "^2.2.7",
     "box2d-wasm": "^7.0.0",
     "entityx-ts": "^2.3.1",
-    "pixi-action-ease": "^3.3.1",
+    "pixi-action-ease": "^3.3.2",
     "pixi-tagged-text-plus": "0.0.1-next.2",
     "pixi.js": "8.12.0",
     "planck": "^1.4.2"