Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop

front/src/Phaser/Entity/Character.ts

@@ -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;
@@ -21,15 +26,6 @@ import { TalkIcon } from "../Components/TalkIcon";
 import { Deferred } from "ts-deferred";
 
 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 {
@@ -248,7 +244,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");
         }
@@ -259,7 +255,7 @@ 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) => {
+            getPlayerAnimations(texture).forEach((d) => {
                 this.scene.anims.create({
                     key: d.key,
                     frames: this.scene.anims.generateFrameNumbers(d.frameModel, { frames: d.frames }),
@@ -279,67 +275,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()) {

front/src/Phaser/Entity/CustomizedCharacter.ts

@@ -1,20 +0,0 @@
-import Container = Phaser.GameObjects.Container;
-import type { Scene } from "phaser";
-import Sprite = Phaser.GameObjects.Sprite;
-
-/**
- * A sprite of a customized character (used in the Customize Scene only)
- */
-export class CustomizedCharacter extends Container {
-    public constructor(scene: Scene, x: number, y: number, layers: string[]) {
-        super(scene, x, y);
-        this.updateSprites(layers);
-    }
-
-    public updateSprites(layers: string[]): void {
-        this.removeAll(true);
-        for (const layer of layers) {
-            this.add(new Sprite(this.scene, 0, 0, layer));
-        }
-    }
-}