Merge branch 'master' into webrtc

This commit is contained in:
gparant 2020-04-26 23:22:40 +02:00
commit ecdbf4269a
9 changed files with 337 additions and 35 deletions

View file

@ -43,12 +43,16 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
//hook preload scene
preload(): void {
cypressAsserter.preloadStarted();
let mapUrl = 'maps/map2.json';
let mapUrl = 'maps/map.json';
this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => {
// Triggered when the map is loaded
// Load tiles attached to the map recursively
this.map = data.data;
this.map.tilesets.forEach((tileset) => {
if (typeof tileset.name === 'undefined' || typeof tileset.image === 'undefined') {
console.warn("Don't know how to handle tileset ", tileset)
return;
}
let path = mapUrl.substr(0, mapUrl.lastIndexOf('/'));
this.load.image(tileset.name, path + '/' + tileset.image);
})
@ -181,8 +185,12 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
});
}
update() : void {
this.CurrentPlayer.moveUser();
/**
* @param time
* @param delta The delta time in ms since the last frame. This is a smoothed and capped value based on the FPS rate.
*/
update(time: number, delta: number) : void {
this.CurrentPlayer.moveUser(delta);
}
/**