Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"

This reverts commit 796a9418d3, reversing changes made to 3506063e65.
2021-05-21 16:24:48 +02:00 · 2021-05-21 16:24:48 +02:00 · 1110f4fb7f
commit 1110f4fb7f
parent 796a9418d3
6 changed files with 42 additions and 79 deletions
--- a/front/src/Api/Events/IframeEvent.ts
+++ b/front/src/Api/Events/IframeEvent.ts
@ -17,7 +17,6 @@ import type { LayerEvent } from './LayerEvent';
 import type { SetPropertyEvent } from "./setPropertyEvent";
 import type { TagEvent } from "./TagEvent";
 import type { TilesetEvent } from "./TilesetEvent";
-import type { UpdateTileEvent } from "./UpdateTileEvent";

 export interface TypedMessageEvent<T> extends MessageEvent {
    data: T
@ -44,8 +43,7 @@ export type IframeEventMap = {
    setProperty: SetPropertyEvent
    getDataLayer: undefined
    getTag: undefined
-    tilesetEvent: TilesetEvent
-    updateTileEvent: UpdateTileEvent
+    tilsetEvent: TilesetEvent
 }
 export interface IframeEvent<T extends keyof IframeEventMap> {
    type: T;
--- a/front/src/Api/Events/UpdateTileEvent.ts
+++ b/front/src/Api/Events/UpdateTileEvent.ts
@ -1,15 +0,0 @@
-import * as tg from "generic-type-guard";
-
-
-export const isUpdateTileEvent = tg.isArray(
-    new tg.IsInterface().withProperties({
-        x: tg.isNumber,
-        y: tg.isNumber,
-        tile: tg.isUnion(tg.isNumber, tg.isString),
-        layer: tg.isString
-    }).get()
-);
-/**
- * A message sent from the game to the iFrame when a user enters or leaves a zone marked with the "zone" property.
- */
-export type UpdateTileEvent = tg.GuardedType<typeof isUpdateTileEvent>;
--- a/front/src/Api/IframeListener.ts
+++ b/front/src/Api/IframeListener.ts
@ -21,7 +21,6 @@ import { isMenuItemRegisterEvent } from './Events/MenuItemRegisterEvent';
 import type { MenuItemClickedEvent } from './Events/MenuItemClickedEvent';
 import type { TagEvent } from "./Events/TagEvent";
 import { isTilesetEvent, TilesetEvent } from "./Events/TilesetEvent";
-import { isUpdateTileEvent, UpdateTileEvent } from './Events/UpdateTileEvent';


 /**
@ -36,6 +35,12 @@ class IframeListener {
    private readonly _openPopupStream: Subject<OpenPopupEvent> = new Subject();
    public readonly openPopupStream = this._openPopupStream.asObservable();

+    private readonly _openTabStream: Subject<OpenTabEvent> = new Subject();
+    public readonly openTabStream = this._openTabStream.asObservable();
+
+    private readonly _goToPageStream: Subject<GoToPageEvent> = new Subject();
+    public readonly goToPageStream = this._goToPageStream.asObservable();
+
    private readonly _openCoWebSiteStream: Subject<OpenCoWebSiteEvent> = new Subject();
    public readonly openCoWebSiteStream = this._openCoWebSiteStream.asObservable();

@ -81,9 +86,6 @@ class IframeListener {
    private readonly _tilesetLoaderStream: Subject<TilesetEvent> =  new Subject();
    public readonly tilesetLoaderStream = this._tilesetLoaderStream.asObservable();

-    private readonly _updateTileStream: Subject<UpdateTileEvent> = new Subject();
-    public readonly updateTileStream = this._updateTileStream.asObservable();
-
    private readonly iframes = new Set<HTMLIFrameElement>();
    private readonly scripts = new Map<string, HTMLIFrameElement>();
    private sendPlayerMove: boolean = false;
@ -154,10 +156,8 @@ class IframeListener {
                    this._registerMenuCommandStream.next(payload.data.menutItem)
                } else if (payload.type == "getTag") {
                    this._tagListStream.next();
-                } else if (payload.type == "tilesetEvent" && isTilesetEvent(payload.data)) {
+                } else if (payload.type == "tilsetEvent" && isTilesetEvent(payload.data)) {
                    this._tilesetLoaderStream.next(payload.data);
-                } else if (payload.type == "updateTileEvent" && isUpdateTileEvent(payload.data)) {
-                    this._updateTileStream.next(payload.data)
                }
            }
        }, false);
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@ -1,4 +1,4 @@
-import { gameManager } from "./GameManager";
+import {gameManager} from "./GameManager";
 import type {
    GroupCreatedUpdatedMessageInterface,
    MessageUserJoined,
@ -80,7 +80,6 @@ import CanvasTexture = Phaser.Textures.CanvasTexture;
 import GameObject = Phaser.GameObjects.GameObject;
 import FILE_LOAD_ERROR = Phaser.Loader.Events.FILE_LOAD_ERROR;
 import DOMElement = Phaser.GameObjects.DOMElement;
-import EVENT_TYPE = Phaser.Scenes.Events
 import type { Subscription } from "rxjs";
 import { worldFullMessageStream } from "../../Connexion/WorldFullMessageStream";
 import { lazyLoadCompanionResource } from "../Companion/CompanionTexturesLoadingManager";
@ -186,7 +185,7 @@ export class GameScene extends DirtyScene implements CenterListener {
    private characterLayers!: string[];
    private companion!: string | null;
    private messageSubscription: Subscription | null = null;
-    private popUpElements: Map<number, DOMElement> = new Map<number, Phaser.GameObjects.DOMElement>();
+    private popUpElements : Map<number, DOMElement> = new Map<number, Phaser.GameObjects.DOMElement>();
    private originalMapUrl: string | undefined;
    private pinchManager: PinchManager | undefined;
    private physicsEnabled: boolean = true;
@ -911,33 +910,12 @@ ${escapedMessage}
            iframeListener.sendUserTagList({list: this.connection.getAllTag()});
        }))

-/*
        this.iframeSubscriptionList.push(iframeListener.tilesetLoaderStream.subscribe((tileset) => {
            //this.load.tilemapTiledJSON('logo', tileset.imgUrl);
            this.load.image('logo', tileset.imgUrl);
            this.Terrains.push(this.Map.addTilesetImage(tileset.name, tileset.imgUrl, tileset.tilewidth, tileset.tileheight, tileset.margin, tileset.spacing));
            this.gameMap.addTerrain(this.Terrains[this.Terrains.length - 1]);
        }))
-*/
-
-        this.iframeSubscriptionList.push(iframeListener.updateTileStream.subscribe(event => {
-            for (const eventTile of event) {
-                const layer = this.gameMap.findPhaserLayer(eventTile.layer);
-                if (layer) {
-                    const tile = layer.getTileAt(eventTile.x, eventTile.y)
-                    if (typeof eventTile.tile == "string") {
-                        const tileIndex = this.getIndexForTileType(eventTile.tile);
-                        if (tileIndex) {
-                            tile.index = tileIndex
-                        } else {
-                            return
-                        }
-                    } else {
-                        tile.index = eventTile.tile
-                    }
-                }
-            }
-        }))

    }

@ -967,19 +945,6 @@ ${escapedMessage}
    }


-    private getIndexForTileType(tileType: string): number | null {
-        for (const tileset of this.mapFile.tilesets) {
-            if (tileset.tiles) {
-                for (const tilesetTile of tileset.tiles) {
-                    if (tilesetTile.type == tileType) {
-                        return tileset.firstgid + tilesetTile.id
-                    }
-                }
-            }
-        }
-        return null
-    }
-
    private getMapDirUrl(): string {
        return this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf('/'));
    }
@ -987,8 +952,8 @@ ${escapedMessage}
    private onMapExit(exitKey: string) {
        if (this.mapTransitioning) return;
        this.mapTransitioning = true;
-        const { roomId, hash } = Room.getIdFromIdentifier(exitKey, this.MapUrlFile, this.instance);
-        if (!roomId) throw new Error('Could not find the room from its exit key: ' + exitKey);
+        const {roomId, hash} = Room.getIdFromIdentifier(exitKey, this.MapUrlFile, this.instance);
+        if (!roomId) throw new Error('Could not find the room from its exit key: '+exitKey);
        urlManager.pushStartLayerNameToUrl(hash);
        const menuScene: MenuScene = this.scene.get(MenuSceneName) as MenuScene
        menuScene.reset()
@ -1190,7 +1155,7 @@ ${escapedMessage}
                this.physics.add.collider(this.CurrentPlayer, phaserLayer, (object1: GameObject, object2: GameObject) => {
                    //this.CurrentPlayer.say("Collision with layer : "+ (object2 as Tile).layer.name)
                });
-                phaserLayer.setCollisionByProperty({ collides: true });
+                phaserLayer.setCollisionByProperty({collides: true});
                if (DEBUG_MODE) {
                    //debug code to see the collision hitbox of the object in the top layer
                    phaserLayer.renderDebug(this.add.graphics(), {
--- a/front/src/Phaser/Map/ITiledMap.ts
+++ b/front/src/Phaser/Map/ITiledMap.ts
@ -36,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 {
@ -65,7 +65,7 @@ export interface ITiledMapGroupLayer {

 export interface ITiledMapTileLayer {
    id?: number,
-    data: number[] | string;
+    data: number[]|string;
    height: number;
    name: string;
    opacity: number;
@ -117,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;
@ -133,12 +133,12 @@ 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
 }
@ -152,7 +152,7 @@ export interface ITiledText {
    underline?: boolean,
    italic?: boolean,
    strikeout?: boolean,
-    halign?: "center" | "right" | "justify" | "left"
+    halign?: "center"|"right"|"justify"|"left"
 }

 export interface ITiledTileSet {
@ -163,14 +163,14 @@ export interface ITiledTileSet {
    imagewidth: number;
    margin: number;
    name: string;
-    properties: { [key: string]: string };
+    properties: {[key: string]: string};
    spacing: number;
    tilecount: number;
    tileheight: number;
    tilewidth: number;
    transparentcolor: string;
    terrains: ITiledMapTerrain[];
-    tiles: Array<ITile>;
+    tiles: {[key: string]: { terrain: number[] }};

    /**
     * Refers to external tileset file (should be JSON)
@ -178,11 +178,6 @@ export interface ITiledTileSet {
    source: string;
 }

-export interface ITile {
-    id: number,
-    type?: string
-}
-
 export interface ITiledMapTerrain {
    name: string;
    tile: number;
--- a/front/src/iframe_api.ts
+++ b/front/src/iframe_api.ts
@ -26,6 +26,8 @@ interface WorkAdventureApi {
    onEnterZone(name: string, callback: () => void): void;
    onLeaveZone(name: string, callback: () => void): void;
    openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup;
+    openTab(url: string): void;
+    goToPage(url: string): void;
    openCoWebSite(url: string): void;
    closeCoWebSite(): void;
    disablePlayerControls() : void;
@ -165,7 +167,7 @@ window.WA = {

    loadTileset(name: string, imgUrl : string, tilewidth : number, tileheight : number, margin : number, spacing : number): void {
        postToParent({
-            type: "updateTileEvent",
+            type: "tilsetEvent",
            data: {
                name: name,
                imgUrl: imgUrl,
@ -274,6 +276,24 @@ window.WA = {
        window.parent.postMessage({ 'type': 'removeBubble' }, '*');
    },

+    openTab(url: string): void {
+        window.parent.postMessage({
+            "type": 'openTab',
+            "data": {
+                url
+            } as OpenTabEvent
+        }, '*');
+    },
+
+    goToPage(url: string): void {
+        window.parent.postMessage({
+            "type": 'goToPage',
+            "data": {
+                url
+            } as GoToPageEvent
+        }, '*');
+    },
+
    openCoWebSite(url: string): void {
        window.parent.postMessage({
            "type": 'openCoWebSite',