Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions

front/src/Phaser/Map/ITiledMap.ts

@@ -4,6 +4,8 @@
  * Represents the interface for the Tiled exported data structure (JSON). Used
  * when loading resources via Resource loader.
  */
+import TilemapLayer = Phaser.Tilemaps.TilemapLayer;
+
 export interface ITiledMap {
     width: number;
     height: number;
@@ -34,7 +36,7 @@ export interface ITiledMap {
 export interface ITiledMapLayerProperty {
     name: string;
     type: string;
-    value: string|boolean|number|undefined;
+    value: string | boolean | number | undefined;
 }
 
 /*export interface ITiledMapLayerBooleanProperty {
@@ -46,7 +48,7 @@ export interface ITiledMapLayerProperty {
 export type ITiledMapLayer = ITiledMapGroupLayer | ITiledMapObjectLayer | ITiledMapTileLayer;
 
 export interface ITiledMapGroupLayer {
-    id?: number,
+    id?: number;
     name: string;
     opacity: number;
     properties?: ITiledMapLayerProperty[];
@@ -62,8 +64,8 @@ export interface ITiledMapGroupLayer {
 }
 
 export interface ITiledMapTileLayer {
-    id?: number,
-    data: number[]|string;
+    id?: number;
+    data: number[] | string;
     height: number;
     name: string;
     opacity: number;
@@ -81,10 +83,11 @@ export interface ITiledMapTileLayer {
      * Draw order (topdown (default), index)
      */
     draworder?: string;
+    phaserLayer?: TilemapLayer;
 }
 
 export interface ITiledMapObjectLayer {
-    id?: number,
+    id?: number;
     height: number;
     name: string;
     opacity: number;
@@ -114,7 +117,7 @@ export interface ITiledMapObject {
     gid: number;
     height: number;
     name: string;
-    properties: {[key: string]: string};
+    properties: { [key: string]: string };
     rotation: number;
     type: string;
     visible: boolean;
@@ -130,26 +133,26 @@ export interface ITiledMapObject {
     /**
      * Polygon points
      */
-    polygon: {x: number, y: number}[];
+    polygon: { x: number; y: number }[];
 
     /**
      * Polyline points
      */
-    polyline: {x: number, y: number}[];
+    polyline: { x: number; y: number }[];
 
-    text?: ITiledText
+    text?: ITiledText;
 }
 
 export interface ITiledText {
-    text: string,
-    wrap?: boolean,
-    fontfamily?: string,
-    pixelsize?: number,
-    color?: string,
-    underline?: boolean,
-    italic?: boolean,
-    strikeout?: boolean,
-    halign?: "center"|"right"|"justify"|"left"
+    text: string;
+    wrap?: boolean;
+    fontfamily?: string;
+    pixelsize?: number;
+    color?: string;
+    underline?: boolean;
+    italic?: boolean;
+    strikeout?: boolean;
+    halign?: "center" | "right" | "justify" | "left";
 }
 
 export interface ITiledTileSet {
@@ -160,7 +163,7 @@ export interface ITiledTileSet {
     imagewidth: number;
     margin: number;
     name: string;
-    properties: {[key: string]: string};
+    properties: { [key: string]: string };
     spacing: number;
     tilecount: number;
     tileheight: number;
@@ -176,10 +179,10 @@ export interface ITiledTileSet {
 }
 
 export interface ITile {
-    id: number,
-    type?: string
+    id: number;
+    type?: string;
 
-    properties?: Array<ITiledMapLayerProperty>
+    properties?: Array<ITiledMapLayerProperty>;
 }
 
 export interface ITiledMapTerrain {

front/src/Phaser/Map/LayersFlattener.ts

@@ -0,0 +1,21 @@
+import type { ITiledMap, ITiledMapLayer } from "./ITiledMap";
+
+/**
+ * Flatten the grouped layers
+ */
+export function flattenGroupLayersMap(map: ITiledMap) {
+    const flatLayers: ITiledMapLayer[] = [];
+    flattenGroupLayers(map.layers, "", flatLayers);
+    return flatLayers;
+}
+
+function flattenGroupLayers(layers: ITiledMapLayer[], prefix: string, flatLayers: ITiledMapLayer[]) {
+    for (const layer of layers) {
+        if (layer.type === "group") {
+            flattenGroupLayers(layer.layers, prefix + layer.name + "/", flatLayers);
+        } else {
+            layer.name = prefix + layer.name;
+            flatLayers.push(layer);
+        }
+    }
+}

front/src/Phaser/Map/LayersIterator.ts

@@ -1,44 +0,0 @@
-import type {ITiledMap, ITiledMapLayer} from "./ITiledMap";
-
-/**
- * Iterates over the layers of a map, flattening the grouped layers
- */
-export class LayersIterator implements IterableIterator<ITiledMapLayer> {
-
-    private layers: ITiledMapLayer[] = [];
-    private pointer: number = 0;
-
-    constructor(private map: ITiledMap) {
-        this.initLayersList(map.layers, '');
-    }
-
-    private initLayersList(layers : ITiledMapLayer[], prefix : string) {
-        for (const layer of layers) {
-            if (layer.type === 'group') {
-                this.initLayersList(layer.layers, prefix + layer.name + '/');
-            } else {
-                const layerWithNewName = { ...layer };
-                layerWithNewName.name = prefix+layerWithNewName.name;
-                this.layers.push(layerWithNewName);
-            }
-        }
-    }
-
-    public next(): IteratorResult<ITiledMapLayer> {
-        if (this.pointer < this.layers.length) {
-            return {
-                done: false,
-                value: this.layers[this.pointer++]
-            }
-        } else {
-            return {
-                done: true,
-                value: null
-            }
-        }
-    }
-
-    [Symbol.iterator](): IterableIterator<ITiledMapLayer> {
-        return new LayersIterator(this.map);
-    }
-}