From 0ac8aac5fb57e0d7be62b7ddc5d4b245c19086f2 Mon Sep 17 00:00:00 2001 From: Bill Date: Sat, 25 Dec 2021 17:11:37 -0500 Subject: [PATCH] Remove asset type check --- src/core/asset/AssetManager.ts | 76 ++--------------------------- src/nitro/room/RoomContentLoader.ts | 72 +-------------------------- 2 files changed, 5 insertions(+), 143 deletions(-) diff --git a/src/core/asset/AssetManager.ts b/src/core/asset/AssetManager.ts index e97f8651..fa61a4fa 100644 --- a/src/core/asset/AssetManager.ts +++ b/src/core/asset/AssetManager.ts @@ -1,4 +1,4 @@ -import { BaseTexture, Resource, Texture } from '@pixi/core'; +import { Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; import { IGraphicAsset } from '../../room'; @@ -170,7 +170,7 @@ export class AssetManager extends Disposable implements IAssetManager const nitroBundle = new NitroBundle(resource.data); const assetData = (nitroBundle.jsonFile as IAssetData); - if(!assetData || !assetData.type) + if(!assetData) { onDownloaded(loader, resource, false); @@ -231,77 +231,7 @@ export class AssetManager extends Disposable implements IAssetManager onDownloaded(loader, resource, true); } - else if(resource.type === LoaderResource.TYPE.JSON) - { - const assetData = (resource.data as IAssetData); - - if(!assetData || !assetData.type) - { - onDownloaded(loader, resource, false); - - return; - } - - if(assetData.spritesheet && Object.keys(assetData.spritesheet).length) - { - const imageName = (assetData.spritesheet.meta && assetData.spritesheet.meta.image); - - if(!imageName || !imageName.length) - { - onDownloaded(loader, resource, false); - - return; - } - - const imageUrl = (resource.url.substring(0, (resource.url.lastIndexOf('/') + 1)) + imageName); - const baseTexture = BaseTexture.from(imageUrl); - - if(baseTexture.valid) - { - const spritesheet = new Spritesheet(baseTexture, assetData.spritesheet); - - spritesheet.parse(() => - { - this.createCollection(assetData, spritesheet); - - onDownloaded(loader, resource, true); - }); - } - else - { - baseTexture.once('loaded', () => - { - baseTexture.removeAllListeners(); - - const spritesheet = new Spritesheet(baseTexture, assetData.spritesheet); - - spritesheet.parse(() => - { - this.createCollection(assetData, spritesheet); - - onDownloaded(loader, resource, true); - }); - }); - - baseTexture.once('error', () => - { - baseTexture.removeAllListeners(); - - onDownloaded(loader, resource, false); - }); - } - - return; - } - - this.createCollection(assetData, null); - - onDownloaded(loader, resource, true); - - return; - } - - if(resource.type === LoaderResource.TYPE.IMAGE) + else if(resource.type === LoaderResource.TYPE.IMAGE) { if(resource.texture.valid) { diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index 8dad9f80..2c9826e8 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -1,4 +1,4 @@ -import { BaseTexture, Resource, Texture } from '@pixi/core'; +import { Resource, Texture } from '@pixi/core'; import { Loader, LoaderResource } from '@pixi/loaders'; import { Spritesheet } from '@pixi/spritesheet'; import { IAssetData } from '../../core/asset/interfaces'; @@ -559,7 +559,7 @@ export class RoomContentLoader implements IFurnitureDataListener const nitroBundle = new NitroBundle(resource.data); const assetData = (nitroBundle.jsonFile as IAssetData); - if(!assetData || !assetData.type) + if(!assetData) { onDownloaded(loader, resource, false); @@ -619,74 +619,6 @@ export class RoomContentLoader implements IFurnitureDataListener onDownloaded(loader, resource, true); } - - else if(resource.type === LoaderResource.TYPE.JSON) - { - const assetData = (resource.data as IAssetData); - - if(!assetData.type) - { - onDownloaded(loader, resource, false); - - return; - } - - if(assetData.spritesheet && Object.keys(assetData.spritesheet).length) - { - const imageName = (assetData.spritesheet.meta && assetData.spritesheet.meta.image); - - if(!imageName || !imageName.length) - { - onDownloaded(loader, resource, false); - - return; - } - - const imageUrl = (resource.url.substring(0, (resource.url.lastIndexOf('/') + 1)) + imageName); - const baseTexture = BaseTexture.from(imageUrl); - - if(baseTexture.valid) - { - const spritesheet = new Spritesheet(baseTexture, assetData.spritesheet); - - spritesheet.parse(() => - { - this.createCollection(assetData, spritesheet); - - onDownloaded(loader, resource, true); - }); - } - else - { - baseTexture.once('loaded', () => - { - baseTexture.removeAllListeners(); - - const spritesheet = new Spritesheet(baseTexture, assetData.spritesheet); - - spritesheet.parse(() => - { - this.createCollection(assetData, spritesheet); - - onDownloaded(loader, resource, true); - }); - }); - - baseTexture.once('error', () => - { - baseTexture.removeAllListeners(); - - onDownloaded(loader, resource, false); - }); - } - - return; - } - - this.createCollection(assetData, null); - - onDownloaded(loader, resource, true); - } else { onDownloaded(loader, resource, false);