diff --git a/front/src/Connexion.ts b/front/src/Connexion.ts index 77c9619f..dc48833c 100644 --- a/front/src/Connexion.ts +++ b/front/src/Connexion.ts @@ -1,8 +1,8 @@ -import {GameManagerInterface} from "./Phaser/Game/GameManager"; +import {GameManager} from "./Phaser/Game/GameManager"; const SocketIo = require('socket.io-client'); import Axios from "axios"; -import {API_URL} from "./Enum/EnvironmentVariable"; +import {API_URL, ROOM} from "./Enum/EnvironmentVariable"; enum EventMessage{ WEBRTC_SIGNAL = "webrtc-signal", @@ -121,7 +121,7 @@ export interface ConnexionInterface { joinARoom(roomId: string): void; - sharePosition(roomId: string, x: number, y: number, direction: string): void; + sharePosition(x: number, y: number, direction: string): void; positionOfAllUser(): void; @@ -140,9 +140,9 @@ export class Connexion implements ConnexionInterface { userId: string; startedRoom: string; - GameManager: GameManagerInterface; + GameManager: GameManager; - constructor(email: string, GameManager: GameManagerInterface) { + constructor(email : string, GameManager: GameManager) { this.email = email; this.GameManager = GameManager; } @@ -164,7 +164,7 @@ export class Connexion implements ConnexionInterface { this.joinARoom(this.startedRoom); //share your first position - this.sharePosition(this.startedRoom, 0, 0); + this.sharePosition(0, 0); this.positionOfAllUser(); @@ -189,16 +189,15 @@ export class Connexion implements ConnexionInterface { /** * - * @param roomId * @param x * @param y * @param direction */ - sharePosition(roomId: string, x: number, y: number, direction: string = "none"): void { - if (!this.socket) { + sharePosition(x : number, y : number, direction : string = "none") : void{ + if(!this.socket){ return; } - let messageUserPosition = new MessageUserPosition(this.userId, roomId, new Point(x, y, direction)); + let messageUserPosition = new MessageUserPosition(this.userId, ROOM[0], new Point(x, y, direction)); this.socket.emit(EventMessage.USER_POSITION, messageUserPosition.toString()); } diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts index 52f08056..1877b29a 100644 --- a/front/src/Phaser/Game/GameManager.ts +++ b/front/src/Phaser/Game/GameManager.ts @@ -1,4 +1,4 @@ -import {GameSceneInterface, GameScene} from "./GameScene"; +import {GameScene} from "./GameScene"; import {ROOM} from "../../Enum/EnvironmentVariable" import {Connexion, ConnexionInterface, ListMessageUserPositionInterface} from "../../Connexion"; import {SimplePeerInterface, SimplePeer} from "../../WebRtc/SimplePeer"; @@ -11,60 +11,35 @@ export enum StatusGameManagerEnum { export let ConnexionInstance : ConnexionInterface; -export interface GameManagerInterface { - GameScenes: Array; - status : number; - SimplePeer: SimplePeerInterface; - createCurrentPlayer() : void; - shareUserPosition(ListMessageUserPosition : ListMessageUserPositionInterface): void; - connect(email : string) : Promise; -} -export class GameManager implements GameManagerInterface { - GameScenes: Array = []; +export class GameManager { status: number; + private ConnexionInstance: Connexion; + private currentGameScene: GameScene; SimplePeer : SimplePeerInterface; constructor() { this.status = StatusGameManagerEnum.IN_PROGRESS; - this.configureGame(); } - - /** - * - * @param email - */ - connect(email : string) : Promise { - ConnexionInstance = new Connexion(email, this); - return ConnexionInstance.createConnexion().then(() => { + + connect(email:string) { + this.ConnexionInstance = new Connexion(email, this); + ConnexionInstance = this.ConnexionInstance; + return this.ConnexionInstance.createConnexion().then(() => { this.SimplePeer = new SimplePeer(ConnexionInstance); }); } - /** - * permit to config rooms - */ - configureGame() { - //create login scene - let LoginScene = new LogincScene(); - this.GameScenes.push(LoginScene) - - //create scene - ROOM.forEach((roomId) => { - let newGame = new GameScene(roomId, this); - this.GameScenes.push((newGame as GameSceneInterface)); - }); + setCurrentGameScene(gameScene: GameScene) { + this.currentGameScene = gameScene; } + /** - * + * Permit to create player in started room */ createCurrentPlayer(): void { //Get started room send by the backend - let game: GameSceneInterface = this.GameScenes.find((Game: GameSceneInterface) => Game.RoomId === ConnexionInstance.startedRoom); - if(!game){ - return; - } - game.createCurrentPlayer(ConnexionInstance.userId); + this.currentGameScene.createCurrentPlayer(this.ConnexionInstance.userId); this.status = StatusGameManagerEnum.CURRENT_USER_CREATED; } @@ -77,11 +52,7 @@ export class GameManager implements GameManagerInterface { return; } try { - let Game: GameSceneInterface = this.GameScenes.find((Game: GameSceneInterface) => Game.RoomId === ListMessageUserPosition.roomId); - if (!Game) { - return; - } - Game.shareUserPosition(ListMessageUserPosition.listUsersPosition) + this.currentGameScene.shareUserPosition(ListMessageUserPosition.listUsersPosition) } catch (e) { console.error(e); } diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index b08db791..e36fe809 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -1,7 +1,8 @@ -import {GameManagerInterface} from "./GameManager"; +import {GameManager, gameManager, StatusGameManagerEnum} from "./GameManager"; import {MessageUserPositionInterface} from "../../Connexion"; import {CurrentGamerInterface, GamerInterface, Player} from "../Player/Player"; -import {DEBUG_MODE, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable"; +import {DEBUG_MODE, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable"; +import Tile = Phaser.Tilemaps.Tile; import {ITiledMap, ITiledTileSet} from "../Map/ITiledMap"; import {cypressAsserter} from "../../Cypress/CypressAsserter"; @@ -12,14 +13,12 @@ export enum Textures { } export interface GameSceneInterface extends Phaser.Scene { - RoomId : string; Map: Phaser.Tilemaps.Tilemap; createCurrentPlayer(UserId : string) : void; shareUserPosition(UsersPosition : Array): void; } export class GameScene extends Phaser.Scene implements GameSceneInterface{ - GameManager : GameManagerInterface; - RoomId : string; + GameManager : GameManager; Terrains : Array; CurrentPlayer: CurrentGamerInterface; MapPlayers : Phaser.Physics.Arcade.Group; @@ -31,17 +30,17 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{ startY = (window.innerHeight / 2) / RESOLUTION; - constructor(RoomId : string, GameManager : GameManagerInterface) { + constructor() { super({ key: "GameScene" }); - this.RoomId = RoomId; - this.GameManager = GameManager; + this.GameManager = gameManager; this.Terrains = []; } //hook preload scene preload(): void { + this.GameManager.setCurrentGameScene(this); cypressAsserter.preloadStarted(); let mapUrl = 'maps/map.json'; this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => { diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts index e99fa42a..a7798720 100644 --- a/front/src/Phaser/Player/Player.ts +++ b/front/src/Phaser/Player/Player.ts @@ -95,7 +95,7 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G private sharePosition(direction: string) { if (ConnexionInstance) { - ConnexionInstance.sharePosition((this.scene as GameSceneInterface).RoomId, this.x, this.y, direction); + ConnexionInstance.sharePosition(this.x, this.y, direction); } } diff --git a/front/src/index.ts b/front/src/index.ts index 09fd9782..d4f048c6 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -1,16 +1,16 @@ import 'phaser'; import GameConfig = Phaser.Types.Core.GameConfig; -import {gameManager, GameManager} from "./Phaser/Game/GameManager"; import {DEBUG_MODE, RESOLUTION} from "./Enum/EnvironmentVariable"; import {cypressAsserter} from "./Cypress/CypressAsserter"; import {LogincScene} from "./Phaser/Login/LogincScene"; +import {GameScene} from "./Phaser/Game/GameScene"; const config: GameConfig = { title: "Office game", width: window.innerWidth / RESOLUTION, height: window.innerHeight / RESOLUTION, parent: "game", - scene: gameManager.GameScenes, + scene: [LogincScene, GameScene], zoom: RESOLUTION, physics: { default: "arcade",