Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'github.com/master' into webrtc

Browse source 
# Conflicts:
#	front/src/Connexion.ts
#	front/src/Phaser/Game/GameManager.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/src/index.ts
This commit is contained in:
gparant 2020-04-29 17:37:17 +02:00
commit 91851c95f3
5 changed files with 34 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

59
front/src/Phaser/Game/GameManager.ts
View file

@ -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<GameSceneInterface>;
status : number;
SimplePeer: SimplePeerInterface;
createCurrentPlayer() : void;
shareUserPosition(ListMessageUserPosition : ListMessageUserPositionInterface): void;
connect(email : string) : Promise<any>;
}
export class GameManager implements GameManagerInterface {
GameScenes: Array<GameSceneInterface> = [];
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<any> {
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);
}