Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

front/src/Phaser/Entity/Character.ts

@@ -83,7 +83,16 @@ export abstract class Character extends Container implements OutlineableInterfac
                 });
             })
             .catch(() => {
-                return lazyLoadPlayerCharacterTextures(scene.load, ["color_22", "eyes_23"]).then((textures) => {
+                return lazyLoadPlayerCharacterTextures(scene.load, [
+                    {
+                        name: "color_22",
+                        img: "resources/customisation/character_color/character_color21.png",
+                    },
+                    {
+                        name: "eyes_23",
+                        img: "resources/customisation/character_eyes/character_eyes23.png",
+                    },
+                ]).then((textures) => {
                     this.addTextures(textures, frame);
                     this.invisible = false;
                     this.playAnimation(direction, moving);

front/src/Phaser/Entity/PlayerTextures.ts

@@ -1,7 +1,5 @@
 //The list of all the player textures, both the default models and the partial textures used for customization
 
-import { PUSHER_URL } from "../../Enum/EnvironmentVariable";
-
 export interface BodyResourceDescriptionListInterface {
     [key: string]: BodyResourceDescriptionInterface;
 }
@@ -12,6 +10,19 @@ export interface BodyResourceDescriptionInterface {
     level?: number;
 }
 
+/**
+ * Temporary object to map layers to the old "level" concept.
+ */
+export const mapLayerToLevel = {
+    woka: -1,
+    body: 0,
+    eyes: 1,
+    hair: 2,
+    clothes: 3,
+    hat: 4,
+    accessory: 5,
+};
+
 enum PlayerTexturesKey {
     Accessory = "accessory",
     Body = "body",

front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts

@@ -1,6 +1,6 @@
 import LoaderPlugin = Phaser.Loader.LoaderPlugin;
 import type { CharacterTexture } from "../../Connexion/LocalUser";
-import { BodyResourceDescriptionInterface, PlayerTextures } from "./PlayerTextures";
+import { BodyResourceDescriptionInterface, mapLayerToLevel, PlayerTextures } from "./PlayerTextures";
 import CancelablePromise from "cancelable-promise";
 
 export interface FrameConfig {
@@ -28,13 +28,11 @@ export const loadAllDefaultModels = (load: LoaderPlugin): BodyResourceDescriptio
     return returnArray;
 };
 
-export const loadCustomTexture = (
+export const loadWokaTexture = (
     loaderPlugin: LoaderPlugin,
-    texture: CharacterTexture
+    texture: BodyResourceDescriptionInterface
 ): CancelablePromise<BodyResourceDescriptionInterface> => {
-    const name = "customCharacterTexture" + texture.id;
-    const playerResourceDescriptor: BodyResourceDescriptionInterface = { name, img: texture.url, level: texture.level };
-    return createLoadingPromise(loaderPlugin, playerResourceDescriptor, {
+    return createLoadingPromise(loaderPlugin, texture, {
         frameWidth: 32,
         frameHeight: 32,
     });
@@ -42,16 +40,15 @@ export const loadCustomTexture = (
 
 export const lazyLoadPlayerCharacterTextures = (
     loadPlugin: LoaderPlugin,
-    texturekeys: Array<string | BodyResourceDescriptionInterface>
+    textures: BodyResourceDescriptionInterface[]
 ): CancelablePromise<string[]> => {
     const promisesList: CancelablePromise<unknown>[] = [];
-    texturekeys.forEach((textureKey: string | BodyResourceDescriptionInterface) => {
+    textures.forEach((texture) => {
         try {
             //TODO refactor
-            const playerResourceDescriptor = getRessourceDescriptor(textureKey);
-            if (playerResourceDescriptor && !loadPlugin.textureManager.exists(playerResourceDescriptor.name)) {
+            if (!loadPlugin.textureManager.exists(texture.name)) {
                 promisesList.push(
-                    createLoadingPromise(loadPlugin, playerResourceDescriptor, {
+                    createLoadingPromise(loadPlugin, texture, {
                         frameWidth: 32,
                         frameHeight: 32,
                     })
@@ -64,9 +61,9 @@ export const lazyLoadPlayerCharacterTextures = (
     let returnPromise: CancelablePromise<Array<string | BodyResourceDescriptionInterface>>;
     if (promisesList.length > 0) {
         loadPlugin.start();
-        returnPromise = CancelablePromise.all(promisesList).then(() => texturekeys);
+        returnPromise = CancelablePromise.all(promisesList).then(() => textures);
     } else {
-        returnPromise = CancelablePromise.resolve(texturekeys);
+        returnPromise = CancelablePromise.resolve(textures);
     }
 
     //If the loading fail, we render the default model instead.
@@ -77,23 +74,6 @@ export const lazyLoadPlayerCharacterTextures = (
     );
 };
 
-export const getRessourceDescriptor = (
-    textureKey: string | BodyResourceDescriptionInterface
-): BodyResourceDescriptionInterface => {
-    if (typeof textureKey !== "string" && textureKey.img) {
-        return textureKey;
-    }
-    const textureName: string = typeof textureKey === "string" ? textureKey : textureKey.name;
-    const playerResource = PlayerTextures.PLAYER_RESOURCES[textureName];
-    if (playerResource !== undefined) return playerResource;
-
-    for (let i = 0; i < PlayerTextures.LAYERS.length; i++) {
-        const playerResource = PlayerTextures.LAYERS[i][textureName];
-        if (playerResource !== undefined) return playerResource;
-    }
-    throw new Error("Could not find a data for texture " + textureName);
-};
-
 export const createLoadingPromise = (
     loadPlugin: LoaderPlugin,
     playerResourceDescriptor: BodyResourceDescriptionInterface,