lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #61 from thecodingmachine/simplify

Browse source 
first step in simplification: remove the concept of room in the front…
This commit is contained in:
David Négrier 2020-04-29 17:11:22 +02:00 committed by GitHub
parent 8d784008b8 edc1136401
commit a286d57a33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
front/src/Connexion.ts
View file

@ -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";
class Message {
userId: string;
@ -107,7 +107,7 @@ export interface ConnexionInterface {
startedRoom : string;
createConnexion() : Promise<any>;
joinARoom(roomId : string) : void;
sharePosition(roomId : string, x : number, y : number, direction : string) : void;
sharePosition(x : number, y : number, direction : string) : void;
positionOfAllUser() : void;
}
export class Connexion implements ConnexionInterface{
@ -117,9 +117,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;
}
@ -141,7 +141,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();
@ -166,16 +166,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{
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('user-position', messageUserPosition.toString());
}

38
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";
@ -9,46 +9,32 @@ export enum StatusGameManagerEnum {
export let ConnexionInstance : ConnexionInterface;
export interface GameManagerInterface {
GameScenes: Array<GameSceneInterface>;
status : number;
createCurrentPlayer() : void;
shareUserPosition(ListMessageUserPosition : ListMessageUserPositionInterface): void;
}
export class GameManager implements GameManagerInterface {
GameScenes: Array<GameSceneInterface> = [];
export class GameManager {
status: number;
private ConnexionInstance: Connexion;
private currentGameScene: GameScene;
constructor() {
this.status = StatusGameManagerEnum.IN_PROGRESS;
this.configureGame();
}
connect(email:string) {
this.ConnexionInstance = new Connexion(email, this);
ConnexionInstance = this.ConnexionInstance;
return this.ConnexionInstance.createConnexion()
}
/**
* permit to config rooms
*/
configureGame() {
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
* @param RoomId
* @param UserId
*/
createCurrentPlayer(): void {
//Get started room send by the backend
let game: GameSceneInterface = this.GameScenes.find((Game: GameSceneInterface) => Game.RoomId === this.ConnexionInstance.startedRoom);
game.createCurrentPlayer(this.ConnexionInstance.userId);
this.currentGameScene.createCurrentPlayer(this.ConnexionInstance.userId);
this.status = StatusGameManagerEnum.CURRENT_USER_CREATED;
}
@ -61,11 +47,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);
}

14
front/src/Phaser/Game/GameScene.ts
View file

@ -1,7 +1,7 @@
import {GameManagerInterface, StatusGameManagerEnum} 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";
@ -13,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<MessageUserPositionInterface>): void;
}
export class GameScene extends Phaser.Scene implements GameSceneInterface{
GameManager : GameManagerInterface;
RoomId : string;
GameManager : GameManager;
Terrains : Array<Phaser.Tilemaps.Tileset>;
CurrentPlayer: CurrentGamerInterface;
MapPlayers : Phaser.Physics.Arcade.Group;
@ -32,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) => {

2
front/src/Phaser/Player/Player.ts
View file

@ -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);
}
}

4
front/src/index.ts
View file

@ -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: [LogincScene, ...gameManager.GameScenes as any],
scene: [LogincScene, GameScene],
zoom: RESOLUTION,
physics: {
default: "arcade",