mirror of
https://github.com/billsonnn/nitro-renderer.git
synced 2024-11-26 17:30:52 +01:00
Updates
This commit is contained in:
parent
0a15fcd926
commit
036a03f7d0
@ -40,6 +40,8 @@ export class AssetManager implements IAssetManager
|
|||||||
return existing;
|
return existing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NitroLogger.warn(`AssetManager: Asset not found: ${name}`);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,13 +78,9 @@ export class AssetManager implements IAssetManager
|
|||||||
{
|
{
|
||||||
if(!urls || !urls.length) return Promise.resolve(true);
|
if(!urls || !urls.length) return Promise.resolve(true);
|
||||||
|
|
||||||
const promises: Promise<boolean>[] = [];
|
|
||||||
|
|
||||||
for(const url of urls) promises.push(this.downloadAsset(url));
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await Promise.all(promises);
|
await Promise.all(urls.map(url => this.downloadAsset(url)));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -112,22 +110,12 @@ export class AssetManager implements IAssetManager
|
|||||||
|
|
||||||
const response = await fetch(url);
|
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');
|
await this.processAsset(nitroBundle.texture, nitroBundle.jsonFile as IAssetData);
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -3,8 +3,6 @@ import { AvatarRenderLibraryEvent, GetEventDispatcher, NitroEventType } from '@n
|
|||||||
|
|
||||||
export class AvatarAssetDownloadLibrary implements IAvatarAssetDownloadLibrary
|
export class AvatarAssetDownloadLibrary implements IAvatarAssetDownloadLibrary
|
||||||
{
|
{
|
||||||
public static DOWNLOAD_COMPLETE: string = 'AADL_DOWNLOAD_COMPLETE';
|
|
||||||
|
|
||||||
private static NOT_LOADED: number = 0;
|
private static NOT_LOADED: number = 0;
|
||||||
private static LOADING: number = 1;
|
private static LOADING: number = 1;
|
||||||
private static LOADED: number = 2;
|
private static LOADED: number = 2;
|
||||||
|
@ -7,7 +7,8 @@ export class ExpressionAddition implements IExpressionAddition
|
|||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _type: number,
|
private _type: number,
|
||||||
private _visualization: AvatarVisualization) {}
|
private _visualization: AvatarVisualization)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -21,7 +21,8 @@ export class FloatingIdleZAddition implements IAvatarAddition
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _visualization: AvatarVisualization) {}
|
private _visualization: AvatarVisualization)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,8 @@ export class GameClickTargetAddition implements IAvatarAddition
|
|||||||
private _asset: Texture = null;
|
private _asset: Texture = null;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _id: number) {}
|
private _id: number)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -12,7 +12,8 @@ export class GuideStatusBubbleAddition implements IAvatarAddition
|
|||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _visualization: AvatarVisualization,
|
private _visualization: AvatarVisualization,
|
||||||
private _status: number) {}
|
private _status: number)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -10,7 +10,8 @@ export class MutedBubbleAddition implements IAvatarAddition
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _visualization: AvatarVisualization) {}
|
private _visualization: AvatarVisualization)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,8 @@ export class NumberBubbleAddition implements IAvatarAddition
|
|||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _number: number,
|
private _number: number,
|
||||||
private _visualization: AvatarVisualization) {}
|
private _visualization: AvatarVisualization)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,8 @@ export class TypingBubbleAddition implements IAvatarAddition
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _id: number,
|
private _id: number,
|
||||||
private _visualization: AvatarVisualization) {}
|
private _visualization: AvatarVisualization)
|
||||||
|
{}
|
||||||
|
|
||||||
public dispose(): void
|
public dispose(): void
|
||||||
{
|
{
|
||||||
|
@ -114,6 +114,7 @@ export class RoomPlane implements IRoomPlane
|
|||||||
{
|
{
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
if(this._planeTexture.source?.hitMap) this._planeTexture.source.hitMap = null;
|
if(this._planeTexture.source?.hitMap) this._planeTexture.source.hitMap = null;
|
||||||
|
|
||||||
this._planeTexture.destroy(true);
|
this._planeTexture.destroy(true);
|
||||||
|
|
||||||
this._planeTexture = null;
|
this._planeTexture = null;
|
||||||
|
Loading…
Reference in New Issue
Block a user