_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more subtle zone leaving camera work

Browse Source
This commit is contained in:
Hanusiak Piotr 2021-12-08 11:31:49 +01:00
parent 957ba8f8c7
commit 082b33cf02
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
front/src/Phaser/Game/CameraManager.ts
View File

@ -20,6 +20,9 @@ export class CameraManager extends Phaser.Events.EventEmitter {
private cameraMode: CameraMode = CameraMode.Free; private cameraMode: CameraMode = CameraMode.Free;
private restoreZoomTween?: Phaser.Tweens.Tween; private restoreZoomTween?: Phaser.Tweens.Tween;
private startFollowTween?: Phaser.Tweens.Tween;
private cameraFollowTarget?: { x: number; y: number };
constructor(scene: GameScene, cameraBounds: { x: number; y: number }, waScaleManager: WaScaleManager) { constructor(scene: GameScene, cameraBounds: { x: number; y: number }, waScaleManager: WaScaleManager) {
super(); super();
@ -53,16 +56,18 @@ export class CameraManager extends Phaser.Events.EventEmitter {
this.waScaleManager.setFocusTarget(focusOn); this.waScaleManager.setFocusTarget(focusOn);
this.restoreZoomTween?.stop(); this.restoreZoomTween?.stop();
this.startFollowTween?.stop();
const targetZoomModifier = this.waScaleManager.getTargetZoomModifierFor(focusOn.width, focusOn.height); const targetZoomModifier = this.waScaleManager.getTargetZoomModifierFor(focusOn.width, focusOn.height);
const currentZoomModifier = this.waScaleManager.zoomModifier; const currentZoomModifier = this.waScaleManager.zoomModifier;
const zoomModifierChange = targetZoomModifier - currentZoomModifier; const zoomModifierChange = targetZoomModifier - currentZoomModifier;
this.camera.stopFollow(); this.camera.stopFollow();
this.cameraFollowTarget = undefined;
this.camera.pan( this.camera.pan(
focusOn.x + focusOn.width * 0.5, focusOn.x + focusOn.width * 0.5,
focusOn.y + focusOn.height * 0.5, focusOn.y + focusOn.height * 0.5,
duration, duration,
Easing.SineEaseOut, Easing.SineEaseOut,
false, true,
(camera, progress, x, y) => { (camera, progress, x, y) => {
this.waScaleManager.zoomModifier = currentZoomModifier + progress * zoomModifierChange; this.waScaleManager.zoomModifier = currentZoomModifier + progress * zoomModifierChange;
} }
@ -71,31 +76,37 @@ export class CameraManager extends Phaser.Events.EventEmitter {
public leaveFocusMode(player: Player): void { public leaveFocusMode(player: Player): void {
this.waScaleManager.setFocusTarget(); this.waScaleManager.setFocusTarget();
// We are forcing camera.pan to kill previous pan animation on EnterFocusMode
this.camera.pan(player.x, player.y, 1, Easing.SineEaseOut, true);
this.startFollow(player, 1000); this.startFollow(player, 1000);
this.restoreZoom(1000); this.restoreZoom(1000);
} }
public startFollow(target: object | Phaser.GameObjects.GameObject, duration: number = 0): void { public startFollow(target: object | Phaser.GameObjects.GameObject, duration: number = 0): void {
this.cameraFollowTarget = target as { x: number; y: number };
this.setCameraMode(CameraMode.Follow); this.setCameraMode(CameraMode.Follow);
if (duration === 0) { if (duration === 0) {
this.camera.startFollow(target, true); this.camera.startFollow(target, true);
return; return;
} }
// duck typing hack const oldPos = { x: this.camera.scrollX, y: this.camera.scrollY };
this.camera.pan( this.startFollowTween = this.scene.tweens.addCounter({
(target as { x: number; y: number }).x, from: 0,
(target as { x: number; y: number }).y, to: 1,
duration, duration,
Easing.Linear, ease: Easing.SineEaseOut,
true, onUpdate: (tween: Phaser.Tweens.Tween) => {
(camera, progress) => { if (!this.cameraFollowTarget) {
if (progress === 1) { return;
this.camera.startFollow(target, true);
} }
} const shiftX =
); (this.cameraFollowTarget.x - this.camera.worldView.width * 0.5 - oldPos.x) * tween.getValue();
const shiftY =
(this.cameraFollowTarget.y - this.camera.worldView.height * 0.5 - oldPos.y) * tween.getValue();
this.camera.setScroll(oldPos.x + shiftX, oldPos.y + shiftY);
},
onComplete: () => {
this.camera.startFollow(target, true);
},
});
} }
/** /**