better woka preview, wip

2022-03-11 13:36:55 +01:00
parent 9f823506b9
commit 138e8aece4
7 changed files with 240 additions and 171 deletions
@@ -1,4 +1,9 @@
-import { PlayerAnimationDirections, PlayerAnimationTypes } from "../Player/Animation";
+import {
+    AnimationData,
+    getPlayerAnimations,
+    PlayerAnimationDirections,
+    PlayerAnimationTypes,
+} from "../Player/Animation";
 import { SpeechBubble } from "./SpeechBubble";
 import Text = Phaser.GameObjects.Text;
 import Container = Phaser.GameObjects.Container;
@@ -20,15 +25,6 @@ import type CancelablePromise from "cancelable-promise";
 import { TalkIcon } from "../Components/TalkIcon";

 const playerNameY = -25;
-
-interface AnimationData {
-    key: string;
-    frameRate: number;
-    repeat: number;
-    frameModel: string; //todo use an enum
-    frames: number[];
-}
-
 const interactiveRadius = 35;

 export abstract class Character extends Container implements OutlineableInterface {
@@ -232,7 +228,7 @@ export abstract class Character extends Container implements OutlineableInterfac
        }
    }

-    public addTextures(textures: string[], frame?: string | number): void {
+    private addTextures(textures: string[], frame?: string | number): void {
        if (textures.length < 1) {
            throw new TextureError("no texture given");
        }
@@ -243,7 +239,8 @@ export abstract class Character extends Container implements OutlineableInterfac
            }
            const sprite = new Sprite(this.scene, 0, 0, texture, frame);
            this.add(sprite);
-            this.getPlayerAnimations(texture).forEach((d) => {
+            console.log(texture);
+            getPlayerAnimations(texture).forEach((d) => {
                this.scene.anims.create({
                    key: d.key,
                    frames: this.scene.anims.generateFrameNumbers(d.frameModel, { frames: d.frames }),
@@ -263,67 +260,6 @@ export abstract class Character extends Container implements OutlineableInterfac
        return this.scene.plugins.get("rexOutlinePipeline") as unknown as OutlinePipelinePlugin | undefined;
    }

-    private getPlayerAnimations(name: string): AnimationData[] {
-        return [
-            {
-                key: `${name}-${PlayerAnimationDirections.Down}-${PlayerAnimationTypes.Walk}`,
-                frameModel: name,
-                frames: [0, 1, 2, 1],
-                frameRate: 10,
-                repeat: -1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Left}-${PlayerAnimationTypes.Walk}`,
-                frameModel: name,
-                frames: [3, 4, 5, 4],
-                frameRate: 10,
-                repeat: -1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Right}-${PlayerAnimationTypes.Walk}`,
-                frameModel: name,
-                frames: [6, 7, 8, 7],
-                frameRate: 10,
-                repeat: -1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Up}-${PlayerAnimationTypes.Walk}`,
-                frameModel: name,
-                frames: [9, 10, 11, 10],
-                frameRate: 10,
-                repeat: -1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Down}-${PlayerAnimationTypes.Idle}`,
-                frameModel: name,
-                frames: [1],
-                frameRate: 10,
-                repeat: 1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Left}-${PlayerAnimationTypes.Idle}`,
-                frameModel: name,
-                frames: [4],
-                frameRate: 10,
-                repeat: 1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Right}-${PlayerAnimationTypes.Idle}`,
-                frameModel: name,
-                frames: [7],
-                frameRate: 10,
-                repeat: 1,
-            },
-            {
-                key: `${name}-${PlayerAnimationDirections.Up}-${PlayerAnimationTypes.Idle}`,
-                frameModel: name,
-                frames: [10],
-                frameRate: 10,
-                repeat: 1,
-            },
-        ];
-    }
-
    protected playAnimation(direction: PlayerAnimationDirections, moving: boolean): void {
        if (this.invisible) return;
        for (const [texture, sprite] of this.sprites.entries()) {
@@ -1,20 +1,54 @@
 import Container = Phaser.GameObjects.Container;
 import type { Scene } from "phaser";
 import Sprite = Phaser.GameObjects.Sprite;
+import { getPlayerAnimations, PlayerAnimationDirections, PlayerAnimationTypes } from "../Player/Animation";

 /**
 * A sprite of a customized character (used in the Customize Scene only)
 */
 export class CustomizedCharacter extends Container {
+    private sprites: Phaser.GameObjects.Sprite[];
+
    public constructor(scene: Scene, x: number, y: number, layers: string[]) {
        super(scene, x, y);
+        this.sprites = [];
        this.updateSprites(layers);
    }

    public updateSprites(layers: string[]): void {
+        this.sprites = [];
        this.removeAll(true);
-        for (const layer of layers) {
-            this.add(new Sprite(this.scene, 0, 0, layer));
+        for (const texture of layers) {
+            const newSprite = new Sprite(this.scene, 0, 0, texture);
+            this.sprites.push(newSprite);
+            getPlayerAnimations(texture).forEach((d) => {
+                this.scene.anims.create({
+                    key: d.key,
+                    frames: this.scene.anims.generateFrameNumbers(d.frameModel, { frames: d.frames }),
+                    frameRate: d.frameRate,
+                    repeat: d.repeat,
+                });
+            });
+            // Needed, otherwise, animations are not handled correctly.
+            if (this.scene) {
+                this.scene.sys.updateList.add(newSprite);
+            }
+        }
+        this.add(this.sprites);
+    }
+
+    public playAnimation(direction: PlayerAnimationDirections, moving: boolean): void {
+        for (const sprite of this.sprites) {
+            if (!sprite.anims) {
+                console.error("ANIMS IS NOT DEFINED!!!");
+                return;
+            }
+            const textureKey = sprite.texture.key;
+            if (moving && (!sprite.anims.currentAnim || sprite.anims.currentAnim.key !== direction)) {
+                sprite.play(textureKey + "-" + direction + "-" + PlayerAnimationTypes.Walk, true);
+            } else if (!moving) {
+                sprite.anims.play(textureKey + "-" + direction + "-" + PlayerAnimationTypes.Idle, true);
+            }
        }
    }
 }