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

Merge branch 'master' into webrtc

Browse source 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
This commit is contained in:
gparant 2020-05-02 20:51:49 +02:00
parent fdb40ec3e2 dcaf9a8e46
commit 0d6ce5e6e9
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,11 @@ export enum StatusGameManagerEnum {
CURRENT_USER_CREATED = 2
}
export let ConnexionInstance : ConnexionInterface;
export interface HasMovedEvent {
direction: string;
x: number;
y: number;
}
export class GameManager {
status: number;
@ -23,9 +27,8 @@ export class GameManager {
connect(email:string) {
this.ConnexionInstance = new Connexion(email, this);
ConnexionInstance = this.ConnexionInstance;
return this.ConnexionInstance.createConnexion().then(() => {
this.SimplePeer = new SimplePeer(ConnexionInstance);
this.SimplePeer = new SimplePeer(this.ConnexionInstance);
});
}
@ -57,6 +60,10 @@ export class GameManager {
console.error(e);
}
}
pushPlayerPosition(event: HasMovedEvent) {
this.ConnexionInstance.sharePosition(event.x, event.y, event.direction);
}
}
export const gameManager = new GameManager();

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

@ -1,6 +1,6 @@
import {GameManager, gameManager, StatusGameManagerEnum} from "./GameManager";
import {GameManager, gameManager, HasMovedEvent, StatusGameManagerEnum} from "./GameManager";
import {MessageUserPositionInterface} from "../../Connexion";
import {CurrentGamerInterface, GamerInterface, Player} from "../Player/Player";
import {CurrentGamerInterface, GamerInterface, hasMovedEventName, Player} from "../Player/Player";
import {DEBUG_MODE, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import Tile = Phaser.Tilemaps.Tile;
import {ITiledMap, ITiledTileSet} from "../Map/ITiledMap";
@ -168,6 +168,11 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
//create collision
this.createCollisionWithPlayer();
this.createCollisionObject();
this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this))
}
pushPlayerPosition(event: HasMovedEvent) {
this.GameManager.pushPlayerPosition(event);
}
EventToClickOnTile(){

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

@ -1,10 +1,11 @@
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Animation";
import {GameSceneInterface, Textures} from "../Game/GameScene";
import {ConnexionInstance} from "../Game/GameManager";
import {MessageUserPositionInterface} from "../../Connexion";
import {ActiveEventList, UserInputEvent, UserInputManager} from "../UserInput/UserInputManager";
import {PlayableCaracter} from "../Entity/PlayableCaracter";
export const hasMovedEventName = "hasMoved";
export interface CurrentGamerInterface extends PlayableCaracter{
userId : string;
PlayerValue : string;
@ -89,18 +90,11 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
direction = PlayerAnimationNames.None;
this.stop();
}
if(this.previousMove !== PlayerAnimationNames.None || direction !== PlayerAnimationNames.None){
this.sharePosition(direction);
}
this.previousMove = direction;
}
private sharePosition(direction: string) {
if (ConnexionInstance) {
ConnexionInstance.sharePosition(this.x, this.y, direction);
}
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y});
}
//todo: put this method into the NonPlayer class instead
updatePosition(MessageUserPosition: MessageUserPositionInterface) {
playAnimation(this, MessageUserPosition.position.direction);
this.setX(MessageUserPosition.position.x);