diff --git a/packages/assets/src/AssetManager.ts b/packages/assets/src/AssetManager.ts index f4f4cd91..06953fe7 100644 --- a/packages/assets/src/AssetManager.ts +++ b/packages/assets/src/AssetManager.ts @@ -40,6 +40,8 @@ export class AssetManager implements IAssetManager return existing; } + NitroLogger.warn(`AssetManager: Asset not found: ${name}`); + return null; } @@ -76,13 +78,9 @@ export class AssetManager implements IAssetManager { if(!urls || !urls.length) return Promise.resolve(true); - const promises: Promise[] = []; - - for(const url of urls) promises.push(this.downloadAsset(url)); - try { - await Promise.all(promises); + await Promise.all(urls.map(url => this.downloadAsset(url))); return true; } @@ -112,22 +110,12 @@ export class AssetManager implements IAssetManager const response = await fetch(url); - if(response.status !== 200) return false; + if(response.status !== 200 || !response.headers.has('Content-Type') || response.headers.get('Content-Type') !== 'application/octet-stream') return false; - let contentType = 'application/octet-stream'; + const buffer = await response.arrayBuffer(); + const nitroBundle = await NitroBundle.from(buffer); - if(response.headers.has('Content-Type')) contentType = response.headers.get('Content-Type'); - - switch(contentType) - { - case 'application/octet-stream': { - const buffer = await response.arrayBuffer(); - const nitroBundle = await NitroBundle.from(buffer); - - await this.processAsset(nitroBundle.texture, nitroBundle.jsonFile as IAssetData); - break; - } - } + await this.processAsset(nitroBundle.texture, nitroBundle.jsonFile as IAssetData); return true; } diff --git a/packages/avatar/src/AvatarAssetDownloadLibrary.ts b/packages/avatar/src/AvatarAssetDownloadLibrary.ts index ac781af7..504b59bc 100644 --- a/packages/avatar/src/AvatarAssetDownloadLibrary.ts +++ b/packages/avatar/src/AvatarAssetDownloadLibrary.ts @@ -3,8 +3,6 @@ import { AvatarRenderLibraryEvent, GetEventDispatcher, NitroEventType } from '@n export class AvatarAssetDownloadLibrary implements IAvatarAssetDownloadLibrary { - public static DOWNLOAD_COMPLETE: string = 'AADL_DOWNLOAD_COMPLETE'; - private static NOT_LOADED: number = 0; private static LOADING: number = 1; private static LOADED: number = 2; diff --git a/packages/room/src/object/visualization/avatar/additions/ExpressionAddition.ts b/packages/room/src/object/visualization/avatar/additions/ExpressionAddition.ts index dd1bd70f..cc542675 100644 --- a/packages/room/src/object/visualization/avatar/additions/ExpressionAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/ExpressionAddition.ts @@ -7,7 +7,8 @@ export class ExpressionAddition implements IExpressionAddition constructor( private _id: number, private _type: number, - private _visualization: AvatarVisualization) {} + private _visualization: AvatarVisualization) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/FloatingIdleZAddition.ts b/packages/room/src/object/visualization/avatar/additions/FloatingIdleZAddition.ts index 3eba16f1..820b8a69 100644 --- a/packages/room/src/object/visualization/avatar/additions/FloatingIdleZAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/FloatingIdleZAddition.ts @@ -21,7 +21,8 @@ export class FloatingIdleZAddition implements IAvatarAddition constructor( private _id: number, - private _visualization: AvatarVisualization) {} + private _visualization: AvatarVisualization) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/GameClickTargetAddition.ts b/packages/room/src/object/visualization/avatar/additions/GameClickTargetAddition.ts index bcd2758b..de285078 100644 --- a/packages/room/src/object/visualization/avatar/additions/GameClickTargetAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/GameClickTargetAddition.ts @@ -13,7 +13,8 @@ export class GameClickTargetAddition implements IAvatarAddition private _asset: Texture = null; constructor( - private _id: number) {} + private _id: number) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts b/packages/room/src/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts index a5f357eb..0613b4d4 100644 --- a/packages/room/src/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts @@ -12,7 +12,8 @@ export class GuideStatusBubbleAddition implements IAvatarAddition constructor( private _id: number, private _visualization: AvatarVisualization, - private _status: number) {} + private _status: number) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/MutedBubbleAddition.ts b/packages/room/src/object/visualization/avatar/additions/MutedBubbleAddition.ts index 7a981499..84e94016 100644 --- a/packages/room/src/object/visualization/avatar/additions/MutedBubbleAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/MutedBubbleAddition.ts @@ -10,7 +10,8 @@ export class MutedBubbleAddition implements IAvatarAddition constructor( private _id: number, - private _visualization: AvatarVisualization) {} + private _visualization: AvatarVisualization) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/NumberBubbleAddition.ts b/packages/room/src/object/visualization/avatar/additions/NumberBubbleAddition.ts index ad531dab..1d6853a6 100644 --- a/packages/room/src/object/visualization/avatar/additions/NumberBubbleAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/NumberBubbleAddition.ts @@ -15,7 +15,8 @@ export class NumberBubbleAddition implements IAvatarAddition constructor( private _id: number, private _number: number, - private _visualization: AvatarVisualization) {} + private _visualization: AvatarVisualization) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/avatar/additions/TypingBubbleAddition.ts b/packages/room/src/object/visualization/avatar/additions/TypingBubbleAddition.ts index 741899cd..80283405 100644 --- a/packages/room/src/object/visualization/avatar/additions/TypingBubbleAddition.ts +++ b/packages/room/src/object/visualization/avatar/additions/TypingBubbleAddition.ts @@ -11,7 +11,8 @@ export class TypingBubbleAddition implements IAvatarAddition constructor( private _id: number, - private _visualization: AvatarVisualization) {} + private _visualization: AvatarVisualization) + {} public dispose(): void { diff --git a/packages/room/src/object/visualization/room/RoomPlane.ts b/packages/room/src/object/visualization/room/RoomPlane.ts index 9aa1b573..932cace2 100644 --- a/packages/room/src/object/visualization/room/RoomPlane.ts +++ b/packages/room/src/object/visualization/room/RoomPlane.ts @@ -114,6 +114,7 @@ export class RoomPlane implements IRoomPlane { //@ts-ignore if(this._planeTexture.source?.hitMap) this._planeTexture.source.hitMap = null; + this._planeTexture.destroy(true); this._planeTexture = null;