Refactor to include connexion

This commit is contained in:
gparant 2020-04-07 20:41:35 +02:00
parent 5d463d097a
commit bac1e804ad
8 changed files with 88 additions and 24 deletions

View File

@ -1,3 +1,5 @@
import {GameManagerInterface} from "./Phaser/Game/GameManager";
const SocketIo = require('socket.io-client');
import Axios from "axios";
import {API_URL} from "./Enum/EnvironmentVariable";
@ -70,8 +72,11 @@ export class Connexion {
email : string;
startedRoom : string;
constructor(email : string) {
GameManager: GameManagerInterface;
constructor(email : string, GameManager: GameManagerInterface) {
this.email = email;
this.GameManager = GameManager;
Axios.post(`${API_URL}/login`, {email: email})
.then((res) => {
this.token = res.data.token;
@ -87,9 +92,8 @@ export class Connexion {
this.joinARoom(this.startedRoom);
//share your first position
this.sharePosition(0, 0);
this.sharePosition(this.startedRoom, 0, 0);
//create listen event to get all data user shared by the back
this.positionOfAllUser();
this.errorMessage();
@ -114,8 +118,8 @@ export class Connexion {
* @param x
* @param y
*/
sharePosition(x : number, y : number){
let messageUserPosition = new MessageUserPosition(this.email, this.startedRoom, new Point(x, y));
sharePosition(roomId : string, x : number, y : number){
let messageUserPosition = new MessageUserPosition(this.email, roomId, new Point(x, y));
this.socket.emit('user-position', messageUserPosition.toString());
}
@ -135,8 +139,10 @@ export class Connexion {
**/
positionOfAllUser(){
this.socket.on("user-position", (message : string) => {
//TODO show all user in map
console.info("user-position", message);
let data = JSON.parse(message);
data.forEach((UserPositions : any) => {
this.GameManager.sharedUserPosition(UserPositions);
});
});
}

View File

@ -1,7 +1,9 @@
const API_URL = process.env.API_URL || "http://api.workadventure.localhost";
const ROOM = [process.env.ROOM || "THECODINGMACHINE"];
const RESOLUTION = 2;
export {
API_URL,
RESOLUTION
RESOLUTION,
ROOM
}

View File

@ -1,5 +1,5 @@
import {RESOLUTION} from "../Enum/EnvironmentVariable";
import {Player} from "./Player";
import {RESOLUTION} from "../../Enum/EnvironmentVariable";
import {Player} from "../Player/Player";
import {MapManagerInterface} from "./MapManager";
export interface CameraManagerInterface {

View File

@ -0,0 +1,31 @@
import {GameSceneInterface, GameScene} from "./GameScene";
import {ROOM} from "../../Enum/EnvironmentVariable"
import {Connexion} from "../../Connexion";
export let ConnexionInstance : Connexion;
export interface GameManagerInterface {
GameScenes: Array<GameSceneInterface>;
sharedUserPosition(UserPositions: any): void;
}
export class GameManager implements GameManagerInterface {
GameScenes: Array<GameSceneInterface> = [];
constructor() {
this.configureGame();
ConnexionInstance = new Connexion("test@gmail.com", this);
}
configureGame() {
ROOM.forEach((roomId) => {
let newGame = new GameScene(roomId, this);
this.GameScenes.push(newGame);
});
}
sharedUserPosition(UserPositions: any) {
let Game: GameSceneInterface = this.GameScenes.find((Game: GameSceneInterface) => Game.RoomId === UserPositions.roomId);
Game.sharedUserPosition(UserPositions)
}
}

View File

@ -1,12 +1,19 @@
import {MapManagerInterface, MapManager} from "./MapManager";
import {GameManagerInterface} from "./GameManager";
export class GameScene extends Phaser.Scene {
export interface GameSceneInterface extends Phaser.Scene {
RoomId : string;
sharedUserPosition(data : []): void;
}
export class GameScene extends Phaser.Scene implements GameSceneInterface{
private MapManager : MapManagerInterface;
RoomId : string;
constructor() {
constructor(RoomId : string, GameManager : GameManagerInterface) {
super({
key: "GameScene"
});
this.RoomId = RoomId;
}
//hook preload scene
@ -32,4 +39,9 @@ export class GameScene extends Phaser.Scene {
update(dt: number): void {
this.MapManager.update();
}
sharedUserPosition(data: []): void {
//TODO share position of all user
//console.log("sharedUserPosition", data);
}
}

View File

@ -1,6 +1,7 @@
import {CameraManager, CameraManagerInterface} from "./CameraManager";
import {RESOLUTION} from "../Enum/EnvironmentVariable";
import {Player} from "./Player";
import {RESOLUTION} from "../../Enum/EnvironmentVariable";
import {Player} from "../Player/Player";
import {GameScene, GameSceneInterface} from "./GameScene";
export interface MapManagerInterface {
keyZ: Phaser.Input.Keyboard.Key;
@ -16,6 +17,7 @@ export interface MapManagerInterface {
Map: Phaser.Tilemaps.Tilemap;
Terrain: Phaser.Tilemaps.Tileset;
Camera: CameraManagerInterface;
Scene: GameSceneInterface;
update(): void;
}
export class MapManager implements MapManagerInterface{
@ -32,12 +34,12 @@ export class MapManager implements MapManagerInterface{
Terrain : Phaser.Tilemaps.Tileset;
Camera: CameraManagerInterface;
CurrentPlayer: Player;
Scene: Phaser.Scene;
Scene: GameSceneInterface;
Map: Phaser.Tilemaps.Tilemap;
startX = (window.innerWidth / 2) / RESOLUTION;
startY = (window.innerHeight / 2) / RESOLUTION;
constructor(scene: Phaser.Scene){
constructor(scene: GameSceneInterface){
this.Scene = scene;
//initalise map

View File

@ -1,12 +1,16 @@
import {MapManagerInterface} from "./MapManager";
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Player/Animation";
import {MapManagerInterface} from "../Game/MapManager";
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Animation";
import {Connexion} from "../../Connexion";
import {GameSceneInterface} from "../Game/GameScene";
import {ConnexionInstance} from "../Game/GameManager";
export class Player extends Phaser.GameObjects.Sprite{
MapManager : MapManagerInterface;
PlayerValue : string;
Connexion: Connexion;
constructor(
Scene : Phaser.Scene,
Scene : GameSceneInterface,
x : number,
y : number,
MapManager: MapManagerInterface,
@ -69,6 +73,14 @@ export class Player extends Phaser.GameObjects.Sprite{
}
if(!haveMove){
playAnimation(this, PlayerAnimationNames.None);
}else{
this.sharePosition();
}
}
private sharePosition(){
if(ConnexionInstance) {
ConnexionInstance.sharePosition((this.scene as GameSceneInterface).RoomId, this.x, this.y);
}
}

View File

@ -1,15 +1,16 @@
import 'phaser';
import GameConfig = Phaser.Types.Core.GameConfig;
import {GameScene} from "./Phaser/GameScene";
import {Connexion} from "./Connexion";
import {GameManager} from "./Phaser/Game/GameManager";
import {RESOLUTION} from "./Enum/EnvironmentVariable";
let gameManager = new GameManager();
const config: GameConfig = {
title: "Office game",
width: window.innerWidth / RESOLUTION,
height: window.innerHeight / RESOLUTION,
parent: "game",
scene: [GameScene],
scene: gameManager.GameScenes,
zoom: RESOLUTION,
};
@ -18,5 +19,3 @@ let game = new Phaser.Game(config);
window.addEventListener('resize', function (event) {
game.scale.resize(window.innerWidth / RESOLUTION, window.innerHeight / RESOLUTION);
});
const connexion = new Connexion("test@gmail.com");