Switching customizeScene and gameScene to new ResizableScene

This commit is contained in:
David Négrier 2020-10-08 16:00:29 +02:00
parent 66f3345861
commit 386b25afa0
3 changed files with 7 additions and 15 deletions

View File

@ -45,6 +45,7 @@ import {connectionManager} from "../../Connexion/ConnectionManager";
import {RoomConnection} from "../../Connexion/RoomConnection"; import {RoomConnection} from "../../Connexion/RoomConnection";
import {GlobalMessageManager} from "../../Administration/GlobalMessageManager"; import {GlobalMessageManager} from "../../Administration/GlobalMessageManager";
import {ConsoleGlobalMessageManager} from "../../Administration/ConsoleGlobalMessageManager"; import {ConsoleGlobalMessageManager} from "../../Administration/ConsoleGlobalMessageManager";
import {ResizableScene} from "../Login/ResizableScene";
export enum Textures { export enum Textures {
@ -86,7 +87,7 @@ interface DeleteGroupEventInterface {
groupId: number groupId: number
} }
export class GameScene extends Phaser.Scene implements CenterListener { export class GameScene extends ResizableScene implements CenterListener {
GameManager : GameManager; GameManager : GameManager;
Terrains : Array<Phaser.Tilemaps.Tileset>; Terrains : Array<Phaser.Tilemaps.Tileset>;
CurrentPlayer!: CurrentGamerInterface; CurrentPlayer!: CurrentGamerInterface;
@ -132,7 +133,6 @@ export class GameScene extends Phaser.Scene implements CenterListener {
private startLayerName: string|undefined; private startLayerName: string|undefined;
private presentationModeSprite!: Sprite; private presentationModeSprite!: Sprite;
private chatModeSprite!: Sprite; private chatModeSprite!: Sprite;
private onResizeCallback!: (this: Window, ev: UIEvent) => void;
private gameMap!: GameMap; private gameMap!: GameMap;
private actionableItems: Map<number, ActionableItem> = new Map<number, ActionableItem>(); private actionableItems: Map<number, ActionableItem> = new Map<number, ActionableItem>();
// The item that can be selected by pressing the space key. // The item that can be selected by pressing the space key.
@ -271,7 +271,6 @@ export class GameScene extends Phaser.Scene implements CenterListener {
this.scene.stop(this.scene.key); this.scene.stop(this.scene.key);
this.scene.remove(this.scene.key); this.scene.remove(this.scene.key);
window.removeEventListener('resize', this.onResizeCallback);
}) })
connection.onActionableEvent((message => { connection.onActionableEvent((message => {
@ -565,8 +564,6 @@ export class GameScene extends Phaser.Scene implements CenterListener {
this.switchLayoutMode(); this.switchLayoutMode();
}); });
this.onResizeCallback = this.onResize.bind(this);
window.addEventListener('resize', this.onResizeCallback);
this.reposition(); this.reposition();
// From now, this game scene will be notified of reposition events // From now, this game scene will be notified of reposition events
@ -957,7 +954,6 @@ export class GameScene extends Phaser.Scene implements CenterListener {
this.simplePeer.unregister(); this.simplePeer.unregister();
this.scene.stop(); this.scene.stop();
this.scene.remove(this.scene.key); this.scene.remove(this.scene.key);
window.removeEventListener('resize', this.onResizeCallback);
this.scene.start(nextSceneKey.key, { this.scene.start(nextSceneKey.key, {
startLayerName: nextSceneKey.hash startLayerName: nextSceneKey.hash
}); });
@ -1156,7 +1152,7 @@ export class GameScene extends Phaser.Scene implements CenterListener {
this.connection.emitActionableEvent(itemId, eventName, state, parameters); this.connection.emitActionableEvent(itemId, eventName, state, parameters);
} }
private onResize(): void { public onResize(): void {
this.reposition(); this.reposition();
// Send new viewport to server // Send new viewport to server

View File

@ -6,6 +6,7 @@ import {LAYERS, loadAllLayers} from "../Entity/body_character";
import Sprite = Phaser.GameObjects.Sprite; import Sprite = Phaser.GameObjects.Sprite;
import Container = Phaser.GameObjects.Container; import Container = Phaser.GameObjects.Container;
import {gameManager} from "../Game/GameManager"; import {gameManager} from "../Game/GameManager";
import {ResizableScene} from "./ResizableScene";
export const CustomizeSceneName = "CustomizeScene"; export const CustomizeSceneName = "CustomizeScene";
@ -16,7 +17,7 @@ enum CustomizeTextures{
arrowUp = "arrow_up", arrowUp = "arrow_up",
} }
export class CustomizeScene extends Phaser.Scene { export class CustomizeScene extends ResizableScene {
private textField!: TextField; private textField!: TextField;
private enterField!: TextField; private enterField!: TextField;
@ -35,8 +36,6 @@ export class CustomizeScene extends Phaser.Scene {
private containersRow: Array<Array<Container>> = new Array<Array<Container>>(); private containersRow: Array<Array<Container>> = new Array<Array<Container>>();
private activeRow = 0; private activeRow = 0;
private repositionCallback!: (this: Window, ev: UIEvent) => void;
constructor() { constructor() {
super({ super({
key: CustomizeSceneName key: CustomizeSceneName
@ -144,10 +143,6 @@ export class CustomizeScene extends Phaser.Scene {
this.moveLayers(); this.moveLayers();
} }
}); });
this.repositionCallback = this.reposition.bind(this);
window.addEventListener('resize', this.repositionCallback);
} }
update(time: number, delta: number): void { update(time: number, delta: number): void {
super.update(time, delta); super.update(time, delta);
@ -249,7 +244,7 @@ export class CustomizeScene extends Phaser.Scene {
} }
} }
private reposition() { public onResize(): void {
this.moveLayers(); this.moveLayers();
this.Rectangle.x = this.cameras.main.worldView.x + this.cameras.main.width / 2; this.Rectangle.x = this.cameras.main.worldView.x + this.cameras.main.width / 2;

View File

@ -250,6 +250,7 @@ export class SelectCharacterScene extends ResizableScene {
this.logo.x = this.game.renderer.width - 30; this.logo.x = this.game.renderer.width - 30;
this.logo.y = this.game.renderer.height - 20; this.logo.y = this.game.renderer.height - 20;
this.customizeButton.x = this.game.renderer.width / 2; this.customizeButton.x = this.game.renderer.width / 2;
this.customizeButtonSelected.x = this.game.renderer.width / 2;
for (let i = 0; i <PLAYER_RESOURCES.length; i++) { for (let i = 0; i <PLAYER_RESOURCES.length; i++) {
const player = this.players[i]; const player = this.players[i];