noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature/login-page

Browse Source 
# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Login/LogincScene.ts
This commit is contained in:
gparant 2020-05-06 02:20:28 +02:00
commit 3ec167ee44
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/src/Phaser/Game/GameScene.ts
View File

@ -42,7 +42,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
//hook preload scene //hook preload scene
preload(): void { preload(): void {
this.GameManager.setCurrentGameScene(this); this.GameManager.setCurrentGameScene(this);
cypressAsserter.preloadStarted();
let mapUrl = 'maps/map.json'; let mapUrl = 'maps/map.json';
this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => { this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => {
// Triggered when the map is loaded // Triggered when the map is loaded
@ -69,8 +68,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
}); });
this.load.bitmapFont('main_font', 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml'); this.load.bitmapFont('main_font', 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
cypressAsserter.preloadFinished();
} }
//hook initialisation //hook initialisation
@ -79,8 +76,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
//hook create scene //hook create scene
create(): void { create(): void {
cypressAsserter.initStarted();
//initalise map //initalise map
this.Map = this.add.tilemap("map"); this.Map = this.add.tilemap("map");
this.map.tilesets.forEach((tileset: ITiledTileSet) => { this.map.tilesets.forEach((tileset: ITiledTileSet) => {
@ -120,7 +115,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
//initialise camera //initialise camera
this.initCamera(); this.initCamera();
cypressAsserter.initFinished();
} }
//todo: in a dedicated class/function? //todo: in a dedicated class/function?
@ -182,7 +176,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
this.createCollisionObject(); this.createCollisionObject();
this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this)) this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this))
} }
pushPlayerPosition(event: HasMovedEvent) { pushPlayerPosition(event: HasMovedEvent) {
this.GameManager.pushPlayerPosition(event); this.GameManager.pushPlayerPosition(event);
} }

6
front/src/Phaser/Login/LogincScene.ts
View File

@ -8,6 +8,7 @@ import {Player} from "../Player/Player";
import {getPlayerAnimations, PlayerAnimationNames} from "../Player/Animation"; import {getPlayerAnimations, PlayerAnimationNames} from "../Player/Animation";
import Rectangle = Phaser.GameObjects.Rectangle; import Rectangle = Phaser.GameObjects.Rectangle;
import {PLAYER_RESOURCES} from "../Entity/PlayableCaracter"; import {PLAYER_RESOURCES} from "../Entity/PlayableCaracter";
import {cypressAsserter} from "../../Cypress/CypressAsserter";
//todo: put this constants in a dedicated file //todo: put this constants in a dedicated file
export const LoginSceneName = "LoginScene"; export const LoginSceneName = "LoginScene";
@ -36,10 +37,12 @@ export class LogincScene extends Phaser.Scene implements GameSceneInterface {
} }
preload() { preload() {
cypressAsserter.preloadStarted();
//this.load.image(LoginTextures.playButton, "resources/objects/play_button.png"); //this.load.image(LoginTextures.playButton, "resources/objects/play_button.png");
this.load.image(LoginTextures.icon, "resources/logos/tcm_full.png"); this.load.image(LoginTextures.icon, "resources/logos/tcm_full.png");
// Note: arcade.png from the Phaser 3 examples at: https://github.com/photonstorm/phaser3-examples/tree/master/public/assets/fonts/bitmap // Note: arcade.png from the Phaser 3 examples at: https://github.com/photonstorm/phaser3-examples/tree/master/public/assets/fonts/bitmap
this.load.bitmapFont(LoginTextures.mainFont, 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml'); this.load.bitmapFont(LoginTextures.mainFont, 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
cypressAsserter.preloadFinished();
//add player png //add player png
PLAYER_RESOURCES.forEach((playerResource: any) => { PLAYER_RESOURCES.forEach((playerResource: any) => {
this.load.spritesheet( this.load.spritesheet(
@ -51,6 +54,8 @@ export class LogincScene extends Phaser.Scene implements GameSceneInterface {
} }
create() { create() {
cypressAsserter.initStarted();
this.textField = new TextField(this, this.game.renderer.width / 2, 50, 'Enter your name:'); this.textField = new TextField(this, this.game.renderer.width / 2, 50, 'Enter your name:');
this.textField.setOrigin(0.5).setCenterAlign() this.textField.setOrigin(0.5).setCenterAlign()
this.nameInput = new TextInput(this, this.game.renderer.width / 2 - 64, 70, 4); this.nameInput = new TextInput(this, this.game.renderer.width / 2 - 64, 70, 4);
@ -76,6 +81,7 @@ export class LogincScene extends Phaser.Scene implements GameSceneInterface {
/*create user*/ /*create user*/
this.createCurrentPlayer("test"); this.createCurrentPlayer("test");
cypressAsserter.initFinished();
} }
update(time: number, delta: number): void { update(time: number, delta: number): void {