{
"name":"exitSceneUrl",
"type":"string",
- "value":"\/Floor1\/floor1.json"
+ "value":"..\/Floor1\/floor1.json"
}],
"type":"tilelayer",
"visible":true,
{
"name":"exitSceneUrl",
"type":"string",
- "value":"\/Lyon\/lyon.json"
+ "value":"..\/Lyon\/lyon.json"
}],
"type":"tilelayer",
"visible":true,
{
"name":"exitSceneUrl",
"type":"string",
- "value":"\/Floor0\/floor0.json"
+ "value":"..\/Floor0\/floor0.json"
}],
"type":"tilelayer",
"visible":true,
{
"name":"exitSceneUrl",
"type":"string",
- "value":"\/Floor0\/floor0.json"
+ "value":"..\/Floor0\/floor0.json"
}],
"type":"tilelayer",
"visible":true,
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
});
});
}
token: string;
email: string;
userId: string;
- startedRoom: string;
createConnexion(characterSelected: string): Promise<any>;
token: string;
email: string;
userId: string;
- startedRoom: string;
GameManager: GameManager;
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}`, {
});
//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();
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
}
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;
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;
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"
// 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)
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){
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"));
}
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 {