From: David Négrier Date: Tue, 12 May 2020 22:02:39 +0000 (+0200) Subject: Redirecting to the correct map after login screen based on URL provided X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=faadacddb6a326dec623a9a249c75d37e5fca9cd;p=libreadventure.git Redirecting to the correct map after login screen based on URL provided --- diff --git a/back/src/Assets/Maps/Floor0/floor0.json b/back/src/Assets/Maps/Floor0/floor0.json index 631cb84..be96afa 100644 --- a/back/src/Assets/Maps/Floor0/floor0.json +++ b/back/src/Assets/Maps/Floor0/floor0.json @@ -49,7 +49,7 @@ { "name":"exitSceneUrl", "type":"string", - "value":"\/Floor1\/floor1.json" + "value":"..\/Floor1\/floor1.json" }], "type":"tilelayer", "visible":true, @@ -67,7 +67,7 @@ { "name":"exitSceneUrl", "type":"string", - "value":"\/Lyon\/lyon.json" + "value":"..\/Lyon\/lyon.json" }], "type":"tilelayer", "visible":true, diff --git a/back/src/Assets/Maps/Floor1/floor1.json b/back/src/Assets/Maps/Floor1/floor1.json index 6791b98..b443e68 100644 --- a/back/src/Assets/Maps/Floor1/floor1.json +++ b/back/src/Assets/Maps/Floor1/floor1.json @@ -43,7 +43,7 @@ { "name":"exitSceneUrl", "type":"string", - "value":"\/Floor0\/floor0.json" + "value":"..\/Floor0\/floor0.json" }], "type":"tilelayer", "visible":true, diff --git a/back/src/Assets/Maps/Lyon/floortileset.png b/back/src/Assets/Maps/Lyon/floortileset.png new file mode 100644 index 0000000..c672dcb Binary files /dev/null and b/back/src/Assets/Maps/Lyon/floortileset.png differ diff --git a/back/src/Assets/Maps/Lyon/lyon.json b/back/src/Assets/Maps/Lyon/lyon.json index 69fdff1..0ed62a9 100644 --- a/back/src/Assets/Maps/Lyon/lyon.json +++ b/back/src/Assets/Maps/Lyon/lyon.json @@ -37,7 +37,7 @@ { "name":"exitSceneUrl", "type":"string", - "value":"\/Floor0\/floor0.json" + "value":"..\/Floor0\/floor0.json" }], "type":"tilelayer", "visible":true, diff --git a/back/src/Assets/Maps/Lyon/tilesets_deviant_milkian_1.png b/back/src/Assets/Maps/Lyon/tilesets_deviant_milkian_1.png new file mode 100644 index 0000000..4740013 Binary files /dev/null and b/back/src/Assets/Maps/Lyon/tilesets_deviant_milkian_1.png differ diff --git a/back/src/Controller/MapController.ts b/back/src/Controller/MapController.ts index 65ca795..bc7546c 100644 --- a/back/src/Controller/MapController.ts +++ b/back/src/Controller/MapController.ts @@ -20,7 +20,7 @@ export class MapController { getMaps() { this.App.get("/maps", (req: Request, res: Response) => { return res.status(OK).send({ - mapUrlStart: URL_ROOM_STARTED + mapUrlStart: req.headers.host + "/map/files" + URL_ROOM_STARTED }); }); } diff --git a/front/src/Connexion.ts b/front/src/Connexion.ts index 69b6647..f7d1e7d 100644 --- a/front/src/Connexion.ts +++ b/front/src/Connexion.ts @@ -140,7 +140,6 @@ export interface ConnexionInterface { token: string; email: string; userId: string; - startedRoom: string; createConnexion(characterSelected: string): Promise; @@ -167,7 +166,6 @@ export class Connexion implements ConnexionInterface { token: string; email: string; userId: string; - startedRoom: string; GameManager: GameManager; @@ -183,8 +181,6 @@ export class Connexion implements ConnexionInterface { return Axios.post(`${API_URL}/login`, {email: this.email}) .then((res) => { this.token = res.data.token; - - this.startedRoom = getMapKeyByUrl(res.data.mapUrlStart); this.userId = res.data.userId; this.socket = SocketIo(`${API_URL}`, { @@ -194,10 +190,10 @@ export class Connexion implements ConnexionInterface { }); //join the room - this.joinARoom(this.startedRoom, characterSelected); + //this.joinARoom(this.startedRoom, characterSelected); //share your first position - this.sharePosition(0, 0, characterSelected, this.startedRoom); + //this.sharePosition(0, 0, characterSelected, this.startedRoom); this.positionOfAllUser(); diff --git a/front/src/Enum/EnvironmentVariable.ts b/front/src/Enum/EnvironmentVariable.ts index 50296fe..30250d5 100644 --- a/front/src/Enum/EnvironmentVariable.ts +++ b/front/src/Enum/EnvironmentVariable.ts @@ -3,13 +3,11 @@ const API_URL = process.env.API_URL || "http://api.workadventure.localhost"; const ROOM = [process.env.ROOM || "THECODINGMACHINE"]; const RESOLUTION = 3; const ZOOM_LEVEL = 1/*3/4*/; -const MAP_FILE_URL = `${API_URL}/map/files`; export { DEBUG_MODE, API_URL, RESOLUTION, ZOOM_LEVEL, - ROOM, - MAP_FILE_URL + ROOM } diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts index 428e5fb..7843642 100644 --- a/front/src/Phaser/Game/GameManager.ts +++ b/front/src/Phaser/Game/GameManager.ts @@ -5,7 +5,6 @@ import { ListMessageUserPositionInterface } from "../../Connexion"; import {SimplePeerInterface, SimplePeer} from "../../WebRtc/SimplePeer"; -import {MAP_FILE_URL} from "../../Enum/EnvironmentVariable"; import {getMapKeyByUrl} from "../Login/LogincScene"; import SceneManager = Phaser.Scenes.SceneManager; import ScenePlugin = Phaser.Scenes.ScenePlugin; @@ -135,7 +134,7 @@ export class GameManager { let gameIndex = scene.getIndex(sceneKey); let game : Phaser.Scene = null; if(gameIndex === -1){ - game = new GameScene(sceneKey, `${MAP_FILE_URL}${mapUrl}`); + game = new GameScene(sceneKey, mapUrl); scene.add(sceneKey, game, false); } return sceneKey; diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index d00ad60..701cbe3 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -1,14 +1,13 @@ import {GameManager, gameManager, HasMovedEvent, MapObject, StatusGameManagerEnum} from "./GameManager"; import {GroupCreatedUpdatedMessageInterface, MessageUserPositionInterface} from "../../Connexion"; import {CurrentGamerInterface, GamerInterface, hasMovedEventName, Player} from "../Player/Player"; -import { DEBUG_MODE, MAP_FILE_URL, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable"; +import { DEBUG_MODE, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable"; import {ITiledMap, ITiledMapLayer, ITiledTileSet} from "../Map/ITiledMap"; import {PLAYER_RESOURCES} from "../Entity/PlayableCaracter"; import Texture = Phaser.Textures.Texture; import Sprite = Phaser.GameObjects.Sprite; import CanvasTexture = Phaser.Textures.CanvasTexture; import CreateSceneFromObjectConfig = Phaser.Types.Scenes.CreateSceneFromObjectConfig; -import {getMapKeyByUrl} from "../Login/LogincScene"; export enum Textures { Player = "male1" @@ -61,7 +60,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface, Creat // Triggered when the map is loaded // Load tiles attached to the map recursively this.map = data.data; - let url = this.MapUrlFile.substr(0, this.MapUrlFile.indexOf(`${this.MapKey}.json`)); + let url = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf('/')); this.map.tilesets.forEach((tileset) => { if (typeof tileset.name === 'undefined' || typeof tileset.image === 'undefined') { console.warn("Don't know how to handle tileset ", tileset) @@ -184,20 +183,11 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface, Creat private loadNextGame(layer: ITiledMapLayer, mapWidth: number, tileWidth: number, tileHeight: number){ let exitSceneUrl = this.getExitSceneUrl(layer); - let exitSceneKey = gameManager.loadMap(exitSceneUrl, this.scene); - /*let exitSceneKey = getMapKeyByUrl(exitSceneUrl); + // TODO: eventually compute a relative URL + let absoluteExitSceneUrl = new URL(exitSceneUrl, this.MapUrlFile).href; + console.log('absoluteExitSceneUrl ', absoluteExitSceneUrl); + let exitSceneKey = gameManager.loadMap(absoluteExitSceneUrl, this.scene); - let gameIndex = this.scene.getIndex(exitSceneKey); - let game : Phaser.Scene = null; - if(gameIndex === -1){ - game = new GameScene(exitSceneKey, `${MAP_FILE_URL}${exitSceneUrl}`); - this.scene.add(exitSceneKey, game, false); - }else{ - game = this.scene.get(exitSceneKey); - } - if(!game){ - return; - }*/ let tiles : any = layer.data; tiles.forEach((objectKey : number, key: number) => { if(objectKey === 0){ diff --git a/front/src/Phaser/Login/LogincScene.ts b/front/src/Phaser/Login/LogincScene.ts index 6eac780..3136060 100644 --- a/front/src/Phaser/Login/LogincScene.ts +++ b/front/src/Phaser/Login/LogincScene.ts @@ -8,9 +8,15 @@ import Rectangle = Phaser.GameObjects.Rectangle; import {PLAYER_RESOURCES} from "../Entity/PlayableCaracter"; import {cypressAsserter} from "../../Cypress/CypressAsserter"; import {GroupCreatedUpdatedMessageInterface, MessageUserPositionInterface} from "../../Connexion"; -import {MAP_FILE_URL} from "../../Enum/EnvironmentVariable"; export function getMapKeyByUrl(mapUrlStart: string){ + // FIXME: the key should be computed from the full URL of the map. + let startPos = mapUrlStart.indexOf('://')+3; + let endPos = mapUrlStart.indexOf(".json"); + console.log('MAP KEY '+mapUrlStart.substring(startPos, endPos)); + return mapUrlStart.substring(startPos, endPos); + + let tab = mapUrlStart.split("/"); return tab[tab.length -1].substr(0, tab[tab.length -1].indexOf(".json")); } @@ -99,23 +105,40 @@ export class LogincScene extends Phaser.Scene implements GameSceneInterface { private async login(name: string) { return gameManager.connect(name, this.selectedPlayer.texture.key).then(() => { - return gameManager.loadMaps().then((scene : any) => { - if (!scene) { - return; - } - let key = gameManager.loadMap(scene.mapUrlStart, this.scene); + // Do we have a start URL in the address bar? If so, let's redirect to this address + let mapUrl = this.findMapUrl(); + if (mapUrl !== null) { + let key = gameManager.loadMap(mapUrl, this.scene); this.scene.start(key); - return scene; - }).catch((err) => { - console.error(err); - throw err; - }); + return mapUrl; + } else { + // If we do not have a map address in the URL, let's ask the server for a start map. + return gameManager.loadMaps().then((scene : any) => { + if (!scene) { + return; + } + let key = gameManager.loadMap(window.location.protocol+"//"+scene.mapUrlStart, this.scene); + this.scene.start(key); + return scene; + }).catch((err) => { + console.error(err); + throw err; + }); + } }).catch((err) => { console.error(err); throw err; }); } + private findMapUrl(): string|null { + let path = window.location.pathname; + if (!path.startsWith('/_/')) { + return null; + } + return window.location.protocol+'//'+path.substr(3); + } + Map: Phaser.Tilemaps.Tilemap; initAnimation(): void {