@rpgjs/tiledmap 5.0.0-alpha.4 → 5.0.0-alpha.41

package/dist/server/index4.js

@@ -0,0 +1,117 @@
+import { MapClass } from "./index3.js";
+function prepareTiledPhysicsData(mapData, map) {
+  if (!mapData?.parsedMap) {
+    return;
+  }
+  const tiledMap = new MapClass(mapData.parsedMap);
+  map.tiled = tiledMap;
+  mapData.hitboxes = mapData.hitboxes || [];
+  mapData.width = tiledMap.widthPx;
+  mapData.height = tiledMap.heightPx;
+  map._tiledTileWidth = tiledMap.tilewidth;
+  map._tiledTileHeight = tiledMap.tileheight;
+  map._blockedTiles = collectBlockedTiles(tiledMap);
+}
+function applyTiledPointEvents(mapData) {
+  const objects = mapData?.parsedMap?.objects;
+  if (!Array.isArray(objects) || !Array.isArray(mapData?.events)) {
+    return;
+  }
+  for (const obj of objects) {
+    if (!obj?.point) {
+      continue;
+    }
+    mapData.events = mapData.events.map((eventEntry) => {
+      if (eventEntry?.name === obj.name) {
+        return {
+          event: eventEntry,
+          x: obj.x,
+          y: obj.y
+        };
+      }
+      return eventEntry;
+    }).filter((eventEntry) => eventEntry !== null);
+  }
+}
+function attachTiledCollisionToEntity(owner, map) {
+  if (!owner?.id || !map?._blockedTiles) {
+    return;
+  }
+  const entity = map.physic?.getEntityByUUID(owner.id);
+  if (!entity || typeof entity.canEnterTile !== "function") {
+    return;
+  }
+  const unsubscribers = ensureUnsubscribers(map);
+  const previousUnsubscribe = unsubscribers.get(owner.id);
+  if (previousUnsubscribe) {
+    previousUnsubscribe();
+    unsubscribers.delete(owner.id);
+  }
+  const blockedTiles = map._blockedTiles;
+  const tiledTileWidth = map._tiledTileWidth ?? 32;
+  const tiledTileHeight = map._tiledTileHeight ?? 32;
+  const physicsTileWidth = 32;
+  const physicsTileHeight = 32;
+  const unsubscribe = entity.canEnterTile(({ x, y }) => {
+    const tiledX = Math.floor(x * physicsTileWidth / tiledTileWidth);
+    const tiledY = Math.floor(y * physicsTileHeight / tiledTileHeight);
+    return !blockedTiles.has(`${tiledX},${tiledY}`);
+  });
+  unsubscribers.set(owner.id, unsubscribe);
+}
+function detachTiledCollisionFromEntity(owner, map) {
+  if (!owner?.id) {
+    return;
+  }
+  const unsubscribers = map._tiledCollisionUnsubscribers;
+  if (!unsubscribers) {
+    return;
+  }
+  const unsubscribe = unsubscribers.get(owner.id);
+  if (!unsubscribe) {
+    return;
+  }
+  unsubscribe();
+  unsubscribers.delete(owner.id);
+}
+function resetTiledCollisionHandlers(map) {
+  const unsubscribers = map._tiledCollisionUnsubscribers;
+  if (unsubscribers) {
+    for (const unsubscribe of unsubscribers.values()) {
+      unsubscribe();
+    }
+    unsubscribers.clear();
+  }
+  map._blockedTiles = void 0;
+  map._tiledTileWidth = void 0;
+  map._tiledTileHeight = void 0;
+}
+function collectBlockedTiles(tiledMap) {
+  const blockedTiles = /* @__PURE__ */ new Set();
+  const mapWidth = tiledMap.width;
+  const mapHeight = tiledMap.height;
+  const tileWidth = tiledMap.tilewidth;
+  const tileHeight = tiledMap.tileheight;
+  for (let y = 0; y < mapHeight; y++) {
+    for (let x = 0; x < mapWidth; x++) {
+      const tileInfo = tiledMap.getTileByPosition(x * tileWidth, y * tileHeight, [0, 0], {
+        populateTiles: true
+      });
+      if (tileInfo.hasCollision) {
+        blockedTiles.add(`${x},${y}`);
+      }
+    }
+  }
+  return blockedTiles;
+}
+function ensureUnsubscribers(map) {
+  map._tiledCollisionUnsubscribers = map._tiledCollisionUnsubscribers || /* @__PURE__ */ new Map();
+  return map._tiledCollisionUnsubscribers;
+}
+export {
+  applyTiledPointEvents,
+  attachTiledCollisionToEntity,
+  detachTiledCollisionFromEntity,
+  prepareTiledPhysicsData,
+  resetTiledCollisionHandlers
+};

package/dist/server.d.ts

@@ -1,65 +1,12 @@
 import { RpgMap } from '@rpgjs/server';
-import { MapClass } from '@rpgjs/tiled';
+import { MapClass } from '@canvasengine/tiled';
 declare module "@rpgjs/server" {
     interface RpgMap {
         tiled?: MapClass;
     }
 }
-/**
- * Interface for an RpgMap extended with Tiled functionality
- *
- * @description This interface combines RpgMap with MapClass to enable
- * the use of Tiled methods on RPG maps
- */
 export interface RpgTiledMap extends RpgMap {
     tiled: MapClass;
 }
-/**
- * Tiled Module for RPGJS
- *
- * @description This module extends RPGJS maps with Tiled functionality,
- * allowing TMX map parsing and automatic hitbox creation
- * based on collisions defined in Tiled
- *
- * ## Features
- *
- * - **Automatic parsing**: Parses TMX files from Tiled Map Editor
- * - **Collision detection**: Scans all tiles to detect collisions
- * - **Hitbox creation**: Automatically generates hitboxes for each collision tile
- * - **RpgMap extension**: Adds the `tiled` property to all RpgMap instances
- *
- * ## Usage
- *
- * Once this module is activated, you can use Tiled methods on your maps:
- *
- * @example
- * ```ts
- * // In a map class
- * class MyMap extends RpgMap {
- *     onLoad() {
- *         // Access Tiled functionality
- *         const tiles = this.tiled.getTileByPosition(100, 100);
- *
- *         if (tiles.hasCollision) {
- *             console.log('This position has a collision');
- *         }
- *
- *         // Iterate through all tiles by index
- *         for (let i = 0; i < this.tiled.width * this.tiled.height; i++) {
- *             const tileInfo = this.tiled.getTileByIndex(i);
- *             if (tileInfo.hasCollision) {
- *                 console.log(`Tile ${i} has collision`);
- *             }
- *         }
- *
- *         // Get information about a specific layer
- *         const layer = this.tiled.getLayerByName('Collision');
- *         if (layer) {
- *             console.log('Collision layer found:', layer);
- *         }
- *     }
- * }
- * ```
- */
 declare const _default: any;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/tiledmap",
-  "version": "5.0.0-alpha.4",
+  "version": "5.0.0-alpha.41",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -22,23 +22,25 @@
   "license": "MIT",
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "peerDependencies": {
-    "canvasengine": "2.0.0-beta.21",
-    "@canvasengine/presets": "2.0.0-beta.21",
-    "@rpgjs/common": "5.0.0-alpha.4",
-    "@rpgjs/server": "5.0.0-alpha.4",
-    "@rpgjs/client": "5.0.0-alpha.4",
-    "@rpgjs/tiled": "5.0.0-alpha.4",
-    "@rpgjs/vite": "5.0.0-alpha.4"
+    "@canvasengine/presets": "*",
+    "@rpgjs/client": "5.0.0-alpha.41",
+    "@rpgjs/common": "5.0.0-alpha.41",
+    "@rpgjs/server": "5.0.0-alpha.41",
+    "@rpgjs/vite": "5.0.0-alpha.41",
+    "canvasengine": "*"
   },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@canvasengine/compiler": "2.0.0-beta.21",
-    "vite": "^6.2.5",
-    "vite-plugin-dts": "^4.5.3"
+    "@canvasengine/compiler": "^2.0.0-beta.44",
+    "vite": "^7.3.0",
+    "vite-plugin-dts": "^4.5.4"
   },
   "type": "module",
+  "dependencies": {
+    "@canvasengine/tiled": "^2.0.0-beta.44"
+  },
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build"

package/src/client.ts

@@ -1,6 +1,26 @@
-import { RpgClient, RpgClientEngine } from "@rpgjs/client";
+import { RpgClient } from "@rpgjs/client";
 import { defineModule } from "@rpgjs/common";
+import {
+  attachTiledCollisionToEntity,
+  detachTiledCollisionFromEntity,
+  prepareTiledPhysicsData,
+  resetTiledCollisionHandlers,
+} from "./physics";
 
 export default defineModule<RpgClient>({
-    effects: []
-})
+  componentAnimations: [],
+  sceneMap: {
+    onPhysicsInit(map: any, context: { mapData: any }) {
+      prepareTiledPhysicsData(context?.mapData, map);
+    },
+    onPhysicsEntityAdd(map: any, context: { owner: any }) {
+      attachTiledCollisionToEntity(context?.owner, map);
+    },
+    onPhysicsEntityRemove(map: any, context: { owner: any }) {
+      detachTiledCollisionFromEntity(context?.owner, map);
+    },
+    onPhysicsReset(map: any) {
+      resetTiledCollisionHandlers(map);
+    },
+  },
+});

package/src/index.ts

@@ -2,11 +2,12 @@ import server from "./server";
 import client from "./client";
 import { createModule } from "@rpgjs/common";
 import { provideLoadMap } from "@rpgjs/client";
-import { TiledParser } from "@rpgjs/tiled";
+import { TiledParser } from "@canvasengine/tiled";
 import Tiled from "./tiled.ce";
 
 export function provideTiledMap(options: {
   basePath: string;
+  onLoadMap?: (map: string) => Promise<void>;
 }) {
   return createModule("TiledMap", [
     {
@@ -14,33 +15,41 @@ export function provideTiledMap(options: {
       client,
     },
     provideLoadMap?.(async (map) => {
-      'use client';
-      const response = await fetch(`${options.basePath}/${map}.tmx`)
-      const mapData = (await response.text()).replace(/source="([^"]+)"/g, `source="${options.basePath}/$1"`)
+      "use client";
+      const response = await fetch(`${options.basePath}/${map}.tmx`);
+      const mapData = (await response.text());
       const parser = new TiledParser(mapData);
       const parsedMap = parser.parseMap();
-      const tilesets: any = []
+      const tilesets: any = [];
       for (let tileset of parsedMap.tilesets) {
-        const response = await fetch(`${tileset.source}`);
+        const response = await fetch(`${options.basePath}/${tileset.source}`);
         const tilesetData = await response.text();
         const parser = new TiledParser(tilesetData);
         const parsedTileset = parser.parseTileset();
-        parsedTileset.image.source = `${options.basePath}/${parsedTileset.image.source}`
+        parsedTileset.image.source = `${options.basePath}/${parsedTileset.image.source}`;
         // Preserve firstgid from the original tileset reference
         tilesets.push({
-          ...tileset,  // Preserve original properties including firstgid
-          ...parsedTileset  // Merge with parsed tileset data
-        })
+          ...tileset, // Preserve original properties including firstgid
+          ...parsedTileset, // Merge with parsed tileset data
+        });
       }
-      parsedMap.tilesets = tilesets
-      
+      parsedMap.tilesets = tilesets;
+
       const obj = {
-       data: mapData,
-       component: Tiled,
-       parsedMap,
-       id: map
-     }
-      return obj
+        data: mapData,
+        component: Tiled,
+        parsedMap,
+        id: map,
+        params: {
+          basePath: options.basePath,
+        },
+      };
+
+      if (options.onLoadMap) {
+        await options.onLoadMap(map);
+      }
+
+      return obj;
     }),
   ]);
 }

package/src/physics.ts

@@ -0,0 +1,143 @@
+import { MapClass } from "@canvasengine/tiled";
+
+type AnyMap = {
+  tiled?: MapClass;
+  physic?: {
+    getEntityByUUID(id: string): any;
+  };
+  _blockedTiles?: Set<string>;
+  _tiledTileWidth?: number;
+  _tiledTileHeight?: number;
+  _tiledCollisionUnsubscribers?: Map<string, () => void>;
+};
+
+export function prepareTiledPhysicsData(mapData: any, map: AnyMap): void {
+  if (!mapData?.parsedMap) {
+    return;
+  }
+
+  const tiledMap = new MapClass(mapData.parsedMap);
+  map.tiled = tiledMap;
+
+  mapData.hitboxes = mapData.hitboxes || [];
+  mapData.width = tiledMap.widthPx;
+  mapData.height = tiledMap.heightPx;
+
+  map._tiledTileWidth = tiledMap.tilewidth;
+  map._tiledTileHeight = tiledMap.tileheight;
+  map._blockedTiles = collectBlockedTiles(tiledMap);
+}
+
+export function applyTiledPointEvents(mapData: any): void {
+  const objects = mapData?.parsedMap?.objects;
+  if (!Array.isArray(objects) || !Array.isArray(mapData?.events)) {
+    return;
+  }
+
+  for (const obj of objects) {
+    if (!obj?.point) {
+      continue;
+    }
+
+    mapData.events = mapData.events
+      .map((eventEntry: any) => {
+        if (eventEntry?.name === obj.name) {
+          return {
+            event: eventEntry,
+            x: obj.x,
+            y: obj.y,
+          };
+        }
+        return eventEntry;
+      })
+      .filter((eventEntry: any) => eventEntry !== null);
+  }
+}
+
+export function attachTiledCollisionToEntity(owner: any, map: AnyMap): void {
+  if (!owner?.id || !map?._blockedTiles) {
+    return;
+  }
+
+  const entity = map.physic?.getEntityByUUID(owner.id);
+  if (!entity || typeof entity.canEnterTile !== "function") {
+    return;
+  }
+
+  const unsubscribers = ensureUnsubscribers(map);
+  const previousUnsubscribe = unsubscribers.get(owner.id);
+  if (previousUnsubscribe) {
+    previousUnsubscribe();
+    unsubscribers.delete(owner.id);
+  }
+
+  const blockedTiles = map._blockedTiles;
+  const tiledTileWidth = map._tiledTileWidth ?? 32;
+  const tiledTileHeight = map._tiledTileHeight ?? 32;
+  const physicsTileWidth = 32;
+  const physicsTileHeight = 32;
+
+  const unsubscribe = entity.canEnterTile(({ x, y }) => {
+    const tiledX = Math.floor((x * physicsTileWidth) / tiledTileWidth);
+    const tiledY = Math.floor((y * physicsTileHeight) / tiledTileHeight);
+    return !blockedTiles.has(`${tiledX},${tiledY}`);
+  });
+
+  unsubscribers.set(owner.id, unsubscribe);
+}
+
+export function detachTiledCollisionFromEntity(owner: any, map: AnyMap): void {
+  if (!owner?.id) {
+    return;
+  }
+  const unsubscribers = map._tiledCollisionUnsubscribers;
+  if (!unsubscribers) {
+    return;
+  }
+  const unsubscribe = unsubscribers.get(owner.id);
+  if (!unsubscribe) {
+    return;
+  }
+  unsubscribe();
+  unsubscribers.delete(owner.id);
+}
+
+export function resetTiledCollisionHandlers(map: AnyMap): void {
+  const unsubscribers = map._tiledCollisionUnsubscribers;
+  if (unsubscribers) {
+    for (const unsubscribe of unsubscribers.values()) {
+      unsubscribe();
+    }
+    unsubscribers.clear();
+  }
+
+  map._blockedTiles = undefined;
+  map._tiledTileWidth = undefined;
+  map._tiledTileHeight = undefined;
+}
+
+function collectBlockedTiles(tiledMap: MapClass): Set<string> {
+  const blockedTiles = new Set<string>();
+  const mapWidth = tiledMap.width;
+  const mapHeight = tiledMap.height;
+  const tileWidth = tiledMap.tilewidth;
+  const tileHeight = tiledMap.tileheight;
+
+  for (let y = 0; y < mapHeight; y++) {
+    for (let x = 0; x < mapWidth; x++) {
+      const tileInfo = tiledMap.getTileByPosition(x * tileWidth, y * tileHeight, [0, 0], {
+        populateTiles: true,
+      });
+      if (tileInfo.hasCollision) {
+        blockedTiles.add(`${x},${y}`);
+      }
+    }
+  }
+
+  return blockedTiles;
+}
+
+function ensureUnsubscribers(map: AnyMap): Map<string, () => void> {
+  map._tiledCollisionUnsubscribers = map._tiledCollisionUnsubscribers || new Map();
+  return map._tiledCollisionUnsubscribers;
+}

package/src/server.ts

@@ -1,176 +1,44 @@
 import { RpgMap, RpgServer } from "@rpgjs/server";
-import { TiledParser, MapClass } from "@rpgjs/tiled";
+import { MapClass } from "@canvasengine/tiled";
 import { defineModule } from "@rpgjs/common";
+import {
+  applyTiledPointEvents,
+  attachTiledCollisionToEntity,
+  detachTiledCollisionFromEntity,
+  prepareTiledPhysicsData,
+  resetTiledCollisionHandlers,
+} from "./physics";
 
-// Import TileInfo depuis le bon endroit
-import type { TileInfo } from "@rpgjs/tiled/src/classes/Map";
-
-// Extend RpgMap interface to include tiled property
 declare module "@rpgjs/server" {
   interface RpgMap {
     tiled?: MapClass;
   }
 }
 
-/**
- * Interface for an RpgMap extended with Tiled functionality
- *
- * @description This interface combines RpgMap with MapClass to enable
- * the use of Tiled methods on RPG maps
- */
 export interface RpgTiledMap extends RpgMap {
   tiled: MapClass;
 }
 
-/**
- * Tiled Module for RPGJS
- *
- * @description This module extends RPGJS maps with Tiled functionality,
- * allowing TMX map parsing and automatic hitbox creation
- * based on collisions defined in Tiled
- *
- * ## Features
- *
- * - **Automatic parsing**: Parses TMX files from Tiled Map Editor
- * - **Collision detection**: Scans all tiles to detect collisions
- * - **Hitbox creation**: Automatically generates hitboxes for each collision tile
- * - **RpgMap extension**: Adds the `tiled` property to all RpgMap instances
- *
- * ## Usage
- *
- * Once this module is activated, you can use Tiled methods on your maps:
- *
- * @example
- * ```ts
- * // In a map class
- * class MyMap extends RpgMap {
- *     onLoad() {
- *         // Access Tiled functionality
- *         const tiles = this.tiled.getTileByPosition(100, 100);
- *
- *         if (tiles.hasCollision) {
- *             console.log('This position has a collision');
- *         }
- *
- *         // Iterate through all tiles by index
- *         for (let i = 0; i < this.tiled.width * this.tiled.height; i++) {
- *             const tileInfo = this.tiled.getTileByIndex(i);
- *             if (tileInfo.hasCollision) {
- *                 console.log(`Tile ${i} has collision`);
- *             }
- *         }
- *
- *         // Get information about a specific layer
- *         const layer = this.tiled.getLayerByName('Collision');
- *         if (layer) {
- *             console.log('Collision layer found:', layer);
- *         }
- *     }
- * }
- * ```
- */
 export default defineModule<RpgServer>({
   map: {
-    /**
-     * Hook called before map update
-     *
-     * @description Parses Tiled data and creates collision hitboxes
-     * automatically by iterating through all tiles on the map.
-     *
-     * This method:
-     * 1. Parses TMX data with TiledParser
-     * 2. Creates a MapClass instance with parsed data
-     * 3. Attaches the Tiled instance to the RpgMap
-     * 4. Scans all tiles to detect collisions
-     * 5. Automatically creates hitboxes for each collision tile
-     *
-     * @param mapData - Map data containing TMX information
-     * @param map - RpgMap instance to extend
-     * @returns The modified map instance with tiled property
-     *
-     * @example
-     * ```ts
-     * // Created hitboxes will have this structure:
-     * {
-     *     id: 'collision_x_y',           // Unique identifier
-     *     x: x * tileWidth,              // X position in pixels
-     *     y: y * tileHeight,             // Y position in pixels
-     *     width: tileWidth,              // Tile width
-     *     height: tileHeight,            // Tile height
-     *     properties: {
-     *         type: 'collision',         // Hitbox type
-     *         tileX: x,                  // X position in tiles
-     *         tileY: y,                  // Y position in tiles
-     *         tileIndex: tileIndex       // Tile index
-     *     }
-     * }
-     * ```
-     */
     onBeforeUpdate<T = RpgMap>(mapData: any, map: T): T {
-      const tiledMap = new MapClass(mapData.parsedMap);
-
-      // Attach Tiled instance to the map
-      (map as any).tiled = tiledMap;
-
-      // Initialize hitboxes array
-      mapData.hitboxes = mapData.hitboxes || [];
-      mapData.width = tiledMap.widthPx;
-      mapData.height = tiledMap.heightPx;
-
-      // Iterate through all map tiles to detect collisions
-      const mapWidth = tiledMap.width;
-      const mapHeight = tiledMap.height;
-      const tileWidth = tiledMap.tilewidth;
-      const tileHeight = tiledMap.tileheight;
-
-      // Iterate through each tile on the map
-      for (let y = 0; y < mapHeight; y++) {
-        for (let x = 0; x < mapWidth; x++) {
-          // Use getTileByPosition which is simpler and handles pixel coordinates directly
-          const pixelX = x * tileWidth;
-          const pixelY = y * tileHeight;
-          const tileInfo = tiledMap.getTileByPosition(pixelX, pixelY, [0, 0], {
-            populateTiles: true,
-          });
-
-          // If tile has collision, create a hitbox
-          if (tileInfo.hasCollision) {
-            const hitbox = {
-              id: `collision_${x}_${y}`,
-              x: pixelX,
-              y: pixelY,
-              width: tileWidth,
-              height: tileHeight,
-              properties: {
-                type: "collision",
-                tileX: x,
-                tileY: y,
-                tileIndex: tileInfo.tileIndex,
-              },
-            };
-
-            mapData.hitboxes.push(hitbox);
-          }
-        }
-      }
-
-      for (let obj of mapData.parsedMap.objects) {
-        if (obj.point) {
-          mapData.events = mapData.events
-            .map((e) => {
-              if (e.name === obj.name) {
-                return {
-                  event: e,
-                  x: obj.x,
-                  y: obj.y,
-                };
-              }
-              return e;
-            })
-            .filter((e) => e !== null);
-        }
-      }
+      prepareTiledPhysicsData(mapData, map as any);
+      applyTiledPointEvents(mapData);
       return map;
     },
+    onPhysicsInit(map: any, context: { mapData: any }) {
+      if (!map?._blockedTiles || !map?.tiled) {
+        prepareTiledPhysicsData(context?.mapData, map);
+      }
+    },
+    onPhysicsEntityAdd(map: any, context: { owner: any }) {
+      attachTiledCollisionToEntity(context?.owner, map);
+    },
+    onPhysicsEntityRemove(map: any, context: { owner: any }) {
+      detachTiledCollisionFromEntity(context?.owner, map);
+    },
+    onPhysicsReset(map: any) {
+      resetTiledCollisionHandlers(map);
+    },
   },
 });

package/src/tiled.ce

@@ -1,13 +1,18 @@
 <Container>
-    <TiledMap map basePath="map" createLayersPerTilesZ={true} objectLayer={() => <EventLayerComponent />}  />
+    <TiledMap map basePath createLayersPerTilesZ={true} objectLayer={() => <EventLayerComponent />}  />
 </Container>
 
 <script>
     import { EventLayerComponent } from "@rpgjs/client";
     import { TiledMap } from "@canvasengine/presets";
-    import { signal } from "canvasengine";
+    import { signal, effect } from "canvasengine";
 
-    const { data, children } = defineProps()
+    const { data, params } = defineProps()
 
     const map = signal(data())
+    const basePath = signal(params().basePath)
+
+    effect(() => {
+        map.set(data())
+    })
 </script>