forked from workadventure/workadventure
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
874 additions
and
670 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 75 additions & 41 deletions
116
front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,124 @@ | ||
| import LoaderPlugin = Phaser.Loader.LoaderPlugin; | ||
| import type {CharacterTexture} from "../../Connexion/LocalUser"; | ||
| import {BodyResourceDescriptionInterface, LAYERS, PLAYER_RESOURCES} from "./PlayerTextures"; | ||
| import type { CharacterTexture } from "../../Connexion/LocalUser"; | ||
| import { BodyResourceDescriptionInterface, LAYERS, PLAYER_RESOURCES } from "./PlayerTextures"; | ||
|
|
||
| export interface FrameConfig { | ||
| frameWidth: number, | ||
| frameHeight: number, | ||
| frameWidth: number; | ||
| frameHeight: number; | ||
| } | ||
|
|
||
| export const loadAllLayers = (load: LoaderPlugin): BodyResourceDescriptionInterface[][] => { | ||
| const returnArray:BodyResourceDescriptionInterface[][] = []; | ||
| LAYERS.forEach(layer => { | ||
| const layerArray:BodyResourceDescriptionInterface[] = []; | ||
| const returnArray: BodyResourceDescriptionInterface[][] = []; | ||
| LAYERS.forEach((layer) => { | ||
| const layerArray: BodyResourceDescriptionInterface[] = []; | ||
| Object.values(layer).forEach((textureDescriptor) => { | ||
| layerArray.push(textureDescriptor); | ||
| load.spritesheet(textureDescriptor.name,textureDescriptor.img,{frameWidth: 32, frameHeight: 32}); | ||
| }) | ||
| returnArray.push(layerArray) | ||
| load.spritesheet(textureDescriptor.name, textureDescriptor.img, { frameWidth: 32, frameHeight: 32 }); | ||
| }); | ||
| returnArray.push(layerArray); | ||
| }); | ||
| return returnArray; | ||
| } | ||
| }; | ||
| export const loadAllDefaultModels = (load: LoaderPlugin): BodyResourceDescriptionInterface[] => { | ||
| const returnArray = Object.values(PLAYER_RESOURCES); | ||
| returnArray.forEach((playerResource: BodyResourceDescriptionInterface) => { | ||
| load.spritesheet(playerResource.name, playerResource.img, {frameWidth: 32, frameHeight: 32}); | ||
| load.spritesheet(playerResource.name, playerResource.img, { frameWidth: 32, frameHeight: 32 }); | ||
| }); | ||
| return returnArray; | ||
| } | ||
| }; | ||
|
|
||
| export const loadCustomTexture = (loaderPlugin: LoaderPlugin, texture: CharacterTexture) : Promise<BodyResourceDescriptionInterface> => { | ||
| const name = 'customCharacterTexture'+texture.id; | ||
| const playerResourceDescriptor: BodyResourceDescriptionInterface = {name, img: texture.url, level: texture.level} | ||
| export const loadCustomTexture = ( | ||
| loaderPlugin: LoaderPlugin, | ||
| texture: CharacterTexture | ||
| ): Promise<BodyResourceDescriptionInterface> => { | ||
| const name = "customCharacterTexture" + texture.id; | ||
| const playerResourceDescriptor: BodyResourceDescriptionInterface = { name, img: texture.url, level: texture.level }; | ||
| return createLoadingPromise(loaderPlugin, playerResourceDescriptor, { | ||
| frameWidth: 32, | ||
| frameHeight: 32 | ||
| frameHeight: 32, | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| export const lazyLoadPlayerCharacterTextures = (loadPlugin: LoaderPlugin, texturekeys:Array<string|BodyResourceDescriptionInterface>): Promise<string[]> => { | ||
| const promisesList:Promise<unknown>[] = []; | ||
| texturekeys.forEach((textureKey: string|BodyResourceDescriptionInterface) => { | ||
| export const lazyLoadPlayerCharacterTextures = ( | ||
| loadPlugin: LoaderPlugin, | ||
| texturekeys: Array<string | BodyResourceDescriptionInterface> | ||
| ): Promise<string[]> => { | ||
| const promisesList: Promise<unknown>[] = []; | ||
| texturekeys.forEach((textureKey: string | BodyResourceDescriptionInterface) => { | ||
| try { | ||
| //TODO refactor | ||
| const playerResourceDescriptor = getRessourceDescriptor(textureKey); | ||
| if (playerResourceDescriptor && !loadPlugin.textureManager.exists(playerResourceDescriptor.name)) { | ||
| promisesList.push(createLoadingPromise(loadPlugin, playerResourceDescriptor, { | ||
| frameWidth: 32, | ||
| frameHeight: 32 | ||
| })); | ||
| promisesList.push( | ||
| createLoadingPromise(loadPlugin, playerResourceDescriptor, { | ||
| frameWidth: 32, | ||
| frameHeight: 32, | ||
| }) | ||
| ); | ||
| } | ||
| }catch (err){ | ||
| } catch (err) { | ||
| console.error(err); | ||
| } | ||
| }); | ||
| let returnPromise:Promise<Array<string|BodyResourceDescriptionInterface>>; | ||
| let returnPromise: Promise<Array<string | BodyResourceDescriptionInterface>>; | ||
| if (promisesList.length > 0) { | ||
| loadPlugin.start(); | ||
| returnPromise = Promise.all(promisesList).then(() => texturekeys); | ||
| } else { | ||
| returnPromise = Promise.resolve(texturekeys); | ||
| } | ||
| return returnPromise.then((keys) => keys.map((key) => { | ||
| return typeof key !== 'string' ? key.name : key; | ||
| })) | ||
| } | ||
|
|
||
| export const getRessourceDescriptor = (textureKey: string|BodyResourceDescriptionInterface): BodyResourceDescriptionInterface => { | ||
| if (typeof textureKey !== 'string' && textureKey.img) { | ||
| //If the loading fail, we render the default model instead. | ||
| return returnPromise | ||
| .then((keys) => | ||
| keys.map((key) => { | ||
| return typeof key !== "string" ? key.name : key; | ||
| }) | ||
| ) | ||
| .catch(() => lazyLoadPlayerCharacterTextures(loadPlugin, ["color_22", "eyes_23"])); | ||
| }; | ||
|
|
||
| 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 textureName: string = typeof textureKey === "string" ? textureKey : textureKey.name; | ||
| const playerResource = PLAYER_RESOURCES[textureName]; | ||
| if (playerResource !== undefined) return playerResource; | ||
|
|
||
| for (let i=0; i<LAYERS.length;i++) { | ||
| for (let i = 0; i < LAYERS.length; i++) { | ||
| const playerResource = LAYERS[i][textureName]; | ||
| if (playerResource !== undefined) return playerResource; | ||
| } | ||
| throw 'Could not find a data for texture '+textureName; | ||
| } | ||
| throw "Could not find a data for texture " + textureName; | ||
| }; | ||
|
|
||
| export const createLoadingPromise = (loadPlugin: LoaderPlugin, playerResourceDescriptor: BodyResourceDescriptionInterface, frameConfig: FrameConfig) => { | ||
| return new Promise<BodyResourceDescriptionInterface>((res) => { | ||
| export const createLoadingPromise = ( | ||
| loadPlugin: LoaderPlugin, | ||
| playerResourceDescriptor: BodyResourceDescriptionInterface, | ||
| frameConfig: FrameConfig | ||
| ) => { | ||
| return new Promise<BodyResourceDescriptionInterface>((res, rej) => { | ||
| console.log("count", loadPlugin.listenerCount("loaderror")); | ||
| if (loadPlugin.textureManager.exists(playerResourceDescriptor.name)) { | ||
| return res(playerResourceDescriptor); | ||
| } | ||
| loadPlugin.spritesheet(playerResourceDescriptor.name, playerResourceDescriptor.img, frameConfig); | ||
| loadPlugin.once('filecomplete-spritesheet-' + playerResourceDescriptor.name, () => res(playerResourceDescriptor)); | ||
| const errorCallback = (file: { src: string }) => { | ||
| if (file.src !== playerResourceDescriptor.img) return; | ||
| console.error("failed loading player ressource: ", playerResourceDescriptor); | ||
| rej(playerResourceDescriptor); | ||
| loadPlugin.off("filecomplete-spritesheet-" + playerResourceDescriptor.name, successCallback); | ||
| loadPlugin.off("loaderror", errorCallback); | ||
| }; | ||
| const successCallback = () => { | ||
| loadPlugin.off("loaderror", errorCallback); | ||
| res(playerResourceDescriptor); | ||
| }; | ||
|
|
||
| loadPlugin.once("filecomplete-spritesheet-" + playerResourceDescriptor.name, successCallback); | ||
| loadPlugin.on("loaderror", errorCallback); | ||
| }); | ||
| } | ||
| }; |
Oops, something went wrong.