Эх сурвалжийг харах

[ts][pixi-v7][pixi-v8] Atlas url query params are copied to png url. Closes #2732.

Davide Tantillo 7 сар өмнө
parent
commit
9f3431e7a0

+ 2 - 2
spine-ts/spine-pixi-v7/src/assets/atlasLoader.ts

@@ -29,7 +29,7 @@
 import { TextureAtlas } from "@esotericsoftware/spine-core";
 import { SpineTexture } from "../SpineTexture.js";
 import type { AssetExtension, Loader, UnresolvedAsset } from "@pixi/assets";
-import { Assets } from "@pixi/assets";
+import { Assets, copySearchParams } from "@pixi/assets";
 import { LoaderParserPriority, checkExtension } from "@pixi/assets";
 import type { Texture } from "@pixi/core";
 import { ALPHA_MODES, ExtensionType, settings, utils, BaseTexture, extensions } from "@pixi/core";
@@ -121,7 +121,7 @@ const spineTextureAtlasLoader: AssetExtension<RawAtlas | TextureAtlas, ISpineAtl
 					page.setTexture(SpineTexture.from(providedPage));
 				} else {
 					const url: string = providedPage ?? utils.path.normalize([...basePath.split(utils.path.sep), pageName].join(utils.path.sep));
-					const assetsToLoadIn = { src: url, data: { ...metadata.imageMetadata, ...{ alphaMode: page.pma ? ALPHA_MODES.PMA : ALPHA_MODES.UNPACK } } };
+					const assetsToLoadIn = { src: copySearchParams(url, options.src as string), data: { ...metadata.imageMetadata, ...{ alphaMode: page.pma ? ALPHA_MODES.PMA : ALPHA_MODES.UNPACK } } };
 					const pixiPromise = loader.load<Texture>(assetsToLoadIn)
 						.then((texture) => {
 							page.setTexture(SpineTexture.from(texture.baseTexture));

+ 2 - 1
spine-ts/spine-pixi-v8/src/assets/atlasLoader.ts

@@ -29,6 +29,7 @@
 
 import {
 	checkExtension,
+	copySearchParams,
 	DOMAdapter,
 	extensions,
 	ExtensionType,
@@ -125,7 +126,7 @@ const spineTextureAtlasLoader: AssetExtension<RawAtlas | TextureAtlas, ISpineAtl
 					const url: string = providedPage ?? path.normalize([...basePath.split(path.sep), pageName].join(path.sep));
 
 					const assetsToLoadIn = {
-						src: url,
+						src: copySearchParams(url, options.src as string),
 						data: {
 							...metadata.imageMetadata,
 							alphaMode: page.pma ? 'premultiplied-alpha' : 'premultiply-alpha-on-upload'