duckietm/Nitro_Render_V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro_Render_V3.git synced 2026-06-19 15:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: integrate duckietm/Dev (JSON5 + split-aware gamedata loader)

Browse Source 
# Conflicts:
#	packages/session/src/SessionDataManager.ts
#	yarn.lock
This commit is contained in:
simoleo89
2026-05-19 17:01:58 +02:00
parent 28c552f6f8 64dbe6ba86
commit 807efcff8f
19 changed files with 823 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/assets/src/AssetManager.ts
+5 -5
View File
@@ -1,5 +1,5 @@
import { IAssetData, IAssetManager, IGraphicAsset, IGraphicAssetCollection } from '@nitrots/api';
import { NitroBundle, NitroLogger } from '@nitrots/utils';
import { NitroBundle, NitroLogger, parseConfigJsonFromResponse } from '@nitrots/utils';
import { AnimatedGIF } from '@pixi/gif';
import { Assets, Spritesheet, SpritesheetData, Texture } from 'pixi.js';
import { GraphicAssetCollection } from './GraphicAssetCollection';
@@ -159,7 +159,7 @@ export class AssetManager implements IAssetManager
}
}
}
else if(url.endsWith('.json'))
else if(url.endsWith('.json') || url.endsWith('.json5'))
{
let response: Response;
@@ -178,18 +178,18 @@ export class AssetManager implements IAssetManager
try
{
data = await response.json() as IAssetData;
data = await parseConfigJsonFromResponse<IAssetData>(response, url);
}
catch(parseErr)
{
throw new Error(`Invalid JSON in "${ url }" — the URL may be wrong and returning an HTML page instead of JSON (${ parseErr.message })`);
throw new Error(`Invalid asset data "${ url }" — JSON/JSON5 parse failed (${ parseErr.message })`);
}
let texture: Texture = null;
const imagePath = data?.spritesheet?.meta?.image;
const fallbackImagePath = ((data?.name && data.name.length > 0)
? `${data.name}.png`
: url.replace(/\.json$/i, '.png'));
: url.replace(/\.json5?$/i, '.png'));
const resolvedImageUrl = (imagePath
? new URL(imagePath, url).toString()
: new URL(fallbackImagePath, url).toString());