@safe-engine/cocos 2.5.3 → 2.5.4

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAQ7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,iBA2CnG;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,oBAqCnE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAQ7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,iBA2CnG;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,oBA0CnE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}

package/dist/app.js

@@ -54,13 +54,18 @@ export function loadAll(assets, cb) {
     const allAssets = [];
     Object.values(assets).forEach((value) => {
         if (value.skeleton) {
-            allAssets.push(value.skeleton);
-        }
-        else if (value.atlas) {
-            allAssets.push(value.atlas);
-        }
-        else if (value.texture) {
-            allAssets.push(value.texture);
+            allAssets.push(value.skeleton, value.atlas);
+            if (value.texture) {
+                if (Array.isArray(value.texture)) {
+                    allAssets.push(...value.texture);
+                }
+                else {
+                    allAssets.push(value.texture);
+                }
+            }
+            else {
+                allAssets.push(value.atlas.replace('.atlas', '.png'));
+            }
         }
         else if (value.endsWith('.ttf')) {
             allAssets.push({

package/dist/fasttiled/TiledMapComp.d.ts

@@ -0,0 +1,12 @@
+import { BaseComponentProps, ComponentX } from '..';
+import { TiledMapContainer } from './TiledMapContainer';
+interface TiledMapCompProps extends BaseComponentProps<TiledMapComp> {
+    mapFile: string;
+}
+export declare class TiledMapComp extends ComponentX<TiledMapCompProps, TiledMapContainer> {
+    getLayer(layerName: string): import("./TiledMapContainer").TiledMapLayer;
+    getObjectGroup(layerName: string): any;
+    render(): this;
+}
+export {};
+//# sourceMappingURL=TiledMapComp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TiledMapComp.d.ts","sourceRoot":"","sources":["../../src/fasttiled/TiledMapComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAuB,MAAM,IAAI,CAAA;AAExE,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/fasttiled/TiledMapComp.js

@@ -0,0 +1,18 @@
+import { ComponentX, GameWorld, NodeComp } from '..';
+import { loadIsometricMap } from './tield';
+export class TiledMapComp extends ComponentX {
+    getLayer(layerName) {
+        return this.node.instance.getLayer(layerName);
+    }
+    getObjectGroup(layerName) {
+        return this.node.instance.getObjectGroup(layerName);
+    }
+    render() {
+        const tiledMap = loadIsometricMap(this.props.mapFile);
+        const world = GameWorld.Instance;
+        const entity = world.entities.create();
+        this.node = entity.assign(new NodeComp(tiledMap, entity));
+        const comp = entity.assign(this);
+        return comp;
+    }
+}

package/dist/fasttiled/TiledMapContainer.d.ts

@@ -0,0 +1,31 @@
+import { Vec2 } from '../polyfills';
+export declare class TiledMapContainer extends cc.Node {
+    layers: Map<string, TiledMapLayer>;
+    objectGroups: Map<string, any>;
+    getLayer(layerName: string): TiledMapLayer;
+    getObjectGroup(layerName: string): any;
+}
+export declare class TiledMapLayer extends cc.Node {
+    mapData: any;
+    getPositionAt(tx: number, ty: number): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: cc.Point | Vec2): /*elided*/ any;
+        addSelf(value: cc.Point | Vec2): /*elided*/ any;
+        sub(value: cc.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): cc.Node;
+}
+//# sourceMappingURL=TiledMapContainer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TiledMapContainer.d.ts","sourceRoot":"","sources":["../../src/fasttiled/TiledMapContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAGnC,qBAAa,iBAAkB,SAAQ,EAAE,CAAC,IAAI;IAC5C,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,EAAE,CAAC,IAAI;IACxC,OAAO,EAAE,GAAG,CAAA;IACZ,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAOpC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAIjC"}

package/dist/fasttiled/TiledMapContainer.js

@@ -0,0 +1,25 @@
+import { Vec2 } from '../polyfills';
+import { tileToPixel } from './tield';
+export class TiledMapContainer extends cc.Node {
+    layers = new Map();
+    objectGroups = new Map();
+    getLayer(layerName) {
+        return this.layers.get(layerName);
+    }
+    getObjectGroup(layerName) {
+        return this.objectGroups.get(layerName);
+    }
+}
+export class TiledMapLayer extends cc.Node {
+    mapData;
+    getPositionAt(tx, ty) {
+        // Use zero-based tile coordinates (no +1) and convert local tile position to world space
+        const pos = tileToPixel(this.mapData, tx, ty);
+        const worldPoint = this.convertToWorldSpaceAR(cc.p(pos.x, pos.y));
+        return Vec2(worldPoint);
+    }
+    getTileAt(tx, ty) {
+        const idx = 0 | (tx + ty * this.mapData.width);
+        return this.children[idx];
+    }
+}

package/dist/fasttiled/index.d.ts

@@ -0,0 +1,3 @@
+export * from './TiledMapComp';
+export declare function setupTiledMap(): void;
+//# sourceMappingURL=index.d.ts.map

package/dist/fasttiled/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fasttiled/index.ts"],"names":[],"mappings":"AAGA,cAAc,gBAAgB,CAAA;AAE9B,wBAAgB,aAAa,SAE5B"}

package/dist/fasttiled/index.js

@@ -0,0 +1,6 @@
+import { registerSystem } from '../helper/utils';
+import { TiledMapComp } from './TiledMapComp';
+export * from './TiledMapComp';
+export function setupTiledMap() {
+    registerSystem(TiledMapComp);
+}

package/dist/fasttiled/tield.d.ts

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

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

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

package/dist/fasttiled/tield.js

@@ -0,0 +1,88 @@
+import { TiledMapContainer, TiledMapLayer } from './TiledMapContainer';
+export function tileToPixel(map, tx, ty) {
+    const tw = map.tilewidth;
+    const th = map.tileheight;
+    const { orientation, staggeraxis, staggerindex } = map;
+    // Cocos coordinate system: origin at bottom-left and sprites are centered by default
+    // Convert Tiled (top-left origin) coordinates to Cocos (bottom-left, centered)
+    switch (orientation) {
+        case 'orthogonal': {
+            const x = tx * tw + tw / 2;
+            const y = (map.height - ty - 1) * th + th / 2;
+            return { x, y };
+        }
+        case 'isometric': {
+            // Standard isometric screen coordinates (top-left origin)
+            const x0 = (tx - ty) * (tw / 2);
+            const y0 = (tx + ty) * (th / 2);
+            // full map size in pixels for isometric
+            const mapW = (map.width + map.height) * (tw / 2);
+            const mapH = (map.width + map.height) * (th / 2);
+            const x = x0 + mapW / 2; // center horizontally
+            const y = mapH - y0 - th / 2; // flip Y and center vertically
+            return { x, y };
+        }
+        case 'staggered': {
+            if (staggeraxis === 'x') {
+                const odd = staggerindex === 'odd';
+                const offset = tx % 2 === (odd ? 1 : 0) ? th / 2 : 0;
+                const x0 = tx * (tw / 2);
+                const y0 = ty * th + offset;
+                const x = x0 + tw / 2;
+                const y = map.height * th - y0 - th / 2;
+                return { x, y };
+            }
+            else {
+                const odd = staggerindex === 'odd';
+                const offset = ty % 2 === (odd ? 1 : 0) ? tw / 2 : 0;
+                const x0 = tx * tw + offset;
+                const y0 = ty * (th / 2);
+                const x = x0 + tw / 2;
+                const y = map.height * th - y0 - th / 2;
+                return { x, y };
+            }
+        }
+        default:
+            throw new Error(`Unknown map type: ${orientation}`);
+    }
+}
+export function loadIsometricMap(mapUrl) {
+    const mapData = cc.loader.getRes(mapUrl);
+    const tileset = mapData.tilesets[0];
+    const baseDir = mapUrl.split('/').slice(0, -1).join('/');
+    const tilesetImageUrl = `${baseDir}/${tileset.image}`;
+    const tilesetTexture = cc.loader.getRes(tilesetImageUrl);
+    const tileW = tileset.tilewidth;
+    const tileH = tileset.tileheight;
+    const cols = tileset.columns;
+    const firstGid = tileset.firstgid;
+    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];
+            if (gid === 0)
+                continue;
+            const tileId = gid - firstGid;
+            const frameX = (tileId % cols) * tileW;
+            const frameY = Math.floor(tileId / cols) * tileH;
+            const tx = i % mapData.width;
+            const ty = Math.floor(i / mapData.width);
+            const { x, y } = tileToPixel(mapData, tx, ty);
+            const frame = new cc.SpriteFrame(tilesetTexture, cc.rect(frameX, frameY, tileW, tileH));
+            const sprite = new cc.Sprite(frame);
+            sprite.x = x;
+            sprite.y = y - cc.winSize.height;
+            // console.log('x,y', x, y)
+            tileLayer.addChild(sprite);
+        }
+    }
+    return tilemap;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",