diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire1.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire1.ktx2 new file mode 100644 index 0000000..dae3f47 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire1.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire10.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire10.ktx2 new file mode 100644 index 0000000..8444a98 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire10.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire11.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire11.ktx2 new file mode 100644 index 0000000..f7d5ceb Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire11.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire12.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire12.ktx2 new file mode 100644 index 0000000..957b99e Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire12.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire13.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire13.ktx2 new file mode 100644 index 0000000..464803f Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire13.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire14.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire14.ktx2 new file mode 100644 index 0000000..8c8a2b8 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire14.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire15.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire15.ktx2 new file mode 100644 index 0000000..d21b3ae Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire15.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire16.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire16.ktx2 new file mode 100644 index 0000000..a3f66de Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire16.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire2.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire2.ktx2 new file mode 100644 index 0000000..ebe07d4 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire2.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire3.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire3.ktx2 new file mode 100644 index 0000000..4d84ff6 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire3.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire4.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire4.ktx2 new file mode 100644 index 0000000..ebb7ff7 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire4.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire5.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire5.ktx2 new file mode 100644 index 0000000..5d0a612 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire5.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire6.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire6.ktx2 new file mode 100644 index 0000000..207ff86 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire6.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire7.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire7.ktx2 new file mode 100644 index 0000000..55fd78a Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire7.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire8.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire8.ktx2 new file mode 100644 index 0000000..b6196fc Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire8.ktx2 differ diff --git a/assets/KTX2_ETC1S/animTest/anematicDragonFire9.ktx2 b/assets/KTX2_ETC1S/animTest/anematicDragonFire9.ktx2 new file mode 100644 index 0000000..49e2d48 Binary files /dev/null and b/assets/KTX2_ETC1S/animTest/anematicDragonFire9.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire1.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire1.ktx2 new file mode 100644 index 0000000..6cdb298 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire1.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire10.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire10.ktx2 new file mode 100644 index 0000000..e6206b2 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire10.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire11.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire11.ktx2 new file mode 100644 index 0000000..87040d5 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire11.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire12.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire12.ktx2 new file mode 100644 index 0000000..addb9b9 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire12.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire13.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire13.ktx2 new file mode 100644 index 0000000..162cc11 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire13.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire14.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire14.ktx2 new file mode 100644 index 0000000..25b1852 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire14.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire15.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire15.ktx2 new file mode 100644 index 0000000..5bf8550 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire15.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire16.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire16.ktx2 new file mode 100644 index 0000000..c163de4 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire16.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire2.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire2.ktx2 new file mode 100644 index 0000000..8b4bf51 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire2.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire3.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire3.ktx2 new file mode 100644 index 0000000..4c5e3bb Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire3.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire4.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire4.ktx2 new file mode 100644 index 0000000..9d5acf5 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire4.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire5.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire5.ktx2 new file mode 100644 index 0000000..5987ab8 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire5.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire6.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire6.ktx2 new file mode 100644 index 0000000..41ac4f6 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire6.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire7.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire7.ktx2 new file mode 100644 index 0000000..e87fbc4 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire7.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire8.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire8.ktx2 new file mode 100644 index 0000000..d30a965 Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire8.ktx2 differ diff --git a/assets/KTX2_UASTC/animTest/anematicDragonFire9.ktx2 b/assets/KTX2_UASTC/animTest/anematicDragonFire9.ktx2 new file mode 100644 index 0000000..21595eb Binary files /dev/null and b/assets/KTX2_UASTC/animTest/anematicDragonFire9.ktx2 differ diff --git a/assets/animTest/anematicDragonFire1.jpg b/assets/animTest/anematicDragonFire1.jpg new file mode 100644 index 0000000..15c1537 Binary files /dev/null and b/assets/animTest/anematicDragonFire1.jpg differ diff --git a/assets/animTest/anematicDragonFire10.jpg b/assets/animTest/anematicDragonFire10.jpg new file mode 100644 index 0000000..403e533 Binary files /dev/null and b/assets/animTest/anematicDragonFire10.jpg differ diff --git a/assets/animTest/anematicDragonFire11.jpg b/assets/animTest/anematicDragonFire11.jpg new file mode 100644 index 0000000..cb7fed3 Binary files /dev/null and b/assets/animTest/anematicDragonFire11.jpg differ diff --git a/assets/animTest/anematicDragonFire12.jpg b/assets/animTest/anematicDragonFire12.jpg new file mode 100644 index 0000000..fc05ec3 Binary files /dev/null and b/assets/animTest/anematicDragonFire12.jpg differ diff --git a/assets/animTest/anematicDragonFire13.jpg b/assets/animTest/anematicDragonFire13.jpg new file mode 100644 index 0000000..93e46db Binary files /dev/null and b/assets/animTest/anematicDragonFire13.jpg differ diff --git a/assets/animTest/anematicDragonFire14.jpg b/assets/animTest/anematicDragonFire14.jpg new file mode 100644 index 0000000..5d08ad9 Binary files /dev/null and b/assets/animTest/anematicDragonFire14.jpg differ diff --git a/assets/animTest/anematicDragonFire15.jpg b/assets/animTest/anematicDragonFire15.jpg new file mode 100644 index 0000000..9b9d3df Binary files /dev/null and b/assets/animTest/anematicDragonFire15.jpg differ diff --git a/assets/animTest/anematicDragonFire16.jpg b/assets/animTest/anematicDragonFire16.jpg new file mode 100644 index 0000000..87a7124 Binary files /dev/null and b/assets/animTest/anematicDragonFire16.jpg differ diff --git a/assets/animTest/anematicDragonFire2.jpg b/assets/animTest/anematicDragonFire2.jpg new file mode 100644 index 0000000..779b7d9 Binary files /dev/null and b/assets/animTest/anematicDragonFire2.jpg differ diff --git a/assets/animTest/anematicDragonFire3.jpg b/assets/animTest/anematicDragonFire3.jpg new file mode 100644 index 0000000..2ba1279 Binary files /dev/null and b/assets/animTest/anematicDragonFire3.jpg differ diff --git a/assets/animTest/anematicDragonFire4.jpg b/assets/animTest/anematicDragonFire4.jpg new file mode 100644 index 0000000..c2ecfda Binary files /dev/null and b/assets/animTest/anematicDragonFire4.jpg differ diff --git a/assets/animTest/anematicDragonFire5.jpg b/assets/animTest/anematicDragonFire5.jpg new file mode 100644 index 0000000..a8b5cec Binary files /dev/null and b/assets/animTest/anematicDragonFire5.jpg differ diff --git a/assets/animTest/anematicDragonFire6.jpg b/assets/animTest/anematicDragonFire6.jpg new file mode 100644 index 0000000..95648a0 Binary files /dev/null and b/assets/animTest/anematicDragonFire6.jpg differ diff --git a/assets/animTest/anematicDragonFire7.jpg b/assets/animTest/anematicDragonFire7.jpg new file mode 100644 index 0000000..74f8281 Binary files /dev/null and b/assets/animTest/anematicDragonFire7.jpg differ diff --git a/assets/animTest/anematicDragonFire8.jpg b/assets/animTest/anematicDragonFire8.jpg new file mode 100644 index 0000000..79a8418 Binary files /dev/null and b/assets/animTest/anematicDragonFire8.jpg differ diff --git a/assets/animTest/anematicDragonFire9.jpg b/assets/animTest/anematicDragonFire9.jpg new file mode 100644 index 0000000..40d7449 Binary files /dev/null and b/assets/animTest/anematicDragonFire9.jpg differ diff --git a/assets/ktx_test/x2Portrait-etc1s.ktx2 b/assets/ktxTest/x2Portrait-etc1s.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-etc1s.ktx2 rename to assets/ktxTest/x2Portrait-etc1s.ktx2 diff --git a/assets/ktx_test/x2Portrait-etc1s3.ktx2 b/assets/ktxTest/x2Portrait-etc1s3.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-etc1s3.ktx2 rename to assets/ktxTest/x2Portrait-etc1s3.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-high.ktx2 b/assets/ktxTest/x2Portrait-uastc-high.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-high.ktx2 rename to assets/ktxTest/x2Portrait-uastc-high.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-high3-zlib.ktx2 b/assets/ktxTest/x2Portrait-uastc-high3-zlib.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-high3-zlib.ktx2 rename to assets/ktxTest/x2Portrait-uastc-high3-zlib.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-high3.ktx2 b/assets/ktxTest/x2Portrait-uastc-high3.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-high3.ktx2 rename to assets/ktxTest/x2Portrait-uastc-high3.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-high4-zlib.ktx2 b/assets/ktxTest/x2Portrait-uastc-high4-zlib.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-high4-zlib.ktx2 rename to assets/ktxTest/x2Portrait-uastc-high4-zlib.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-high4.ktx2 b/assets/ktxTest/x2Portrait-uastc-high4.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-high4.ktx2 rename to assets/ktxTest/x2Portrait-uastc-high4.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-mid3-zlib.ktx2 b/assets/ktxTest/x2Portrait-uastc-mid3-zlib.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-mid3-zlib.ktx2 rename to assets/ktxTest/x2Portrait-uastc-mid3-zlib.ktx2 diff --git a/assets/ktx_test/x2Portrait-uastc-mid3.ktx2 b/assets/ktxTest/x2Portrait-uastc-mid3.ktx2 similarity index 100% rename from assets/ktx_test/x2Portrait-uastc-mid3.ktx2 rename to assets/ktxTest/x2Portrait-uastc-mid3.ktx2 diff --git a/assets/ktx_test/x2Portrait.png b/assets/ktxTest/x2Portrait.png similarity index 100% rename from assets/ktx_test/x2Portrait.png rename to assets/ktxTest/x2Portrait.png diff --git a/build/compression/compressToKTX2.sh b/build/compression/compressToKTX2.sh index 4cfa067..34f041b 100644 --- a/build/compression/compressToKTX2.sh +++ b/build/compression/compressToKTX2.sh @@ -8,7 +8,7 @@ start_time_seconds=$SECONDS # ----> Use --dir to give the directory to export the files to <---- if [ "$#" -eq 0 ]; then toktx_params="--t2 --encode etc1s --clevel 5 --qlevel 255" - output_directory="KTX2" + output_directory="KTX2_ETC1S" else toktx_params="$(echo "$*" | sed -n 's/.*--t2 \(.*\)/\1/p')" output_directory="$(echo "$*" | sed -n 's/.*--dir \([^ ]*\) --t2.*/\1/p')" diff --git a/build/compression/compressToKTX2New.sh b/build/compression/compressToKTX2New.sh index fb2c884..3adf6c0 100644 --- a/build/compression/compressToKTX2New.sh +++ b/build/compression/compressToKTX2New.sh @@ -7,10 +7,10 @@ start_time_seconds=$SECONDS # Parse command-line parameters or set default values # ----> Use --dir to give the directory to export the files to <---- if [ "$#" -eq 0 ]; then - toktx_params="--t2 --encode etc1s --clevel 5 --qlevel 255" - output_directory="KTX2" + toktx_params="--encode basis-lz --clevel 5 --qlevel 255" + output_directory="KTX2_ETC1S" else - toktx_params="$(echo "$*" | sed -n 's/.*--encode \(.*\)/\1/p')" + toktx_params="$(echo "$*" | sed -n 's/.*--encode \(.*\)/--encode \1/p')" output_directory="$(echo "$*" | sed -n 's/.*--dir \([^ ]*\) --encode.*/\1/p')" fi @@ -71,7 +71,8 @@ find "$root_directory" -type f \( -iname "*.${extensions[0]}" -o -iname "*.${ext # Run toktx.exe for the current file # Info: https://github.khronos.org/KTX-Software/ktxtools/ktxsc.html - "$script_directory/ktx.exe create" $toktx_params "$new_path" "$file" + echo "$script_directory/ktx.exe" create $toktx_params "$file" "$new_path" + "$script_directory/ktx.exe" create $toktx_params "$file" "$new_path" echo "Created file: $new_path" echo "------------------------" diff --git a/package.json b/package.json index 33103b7..96dff5b 100644 --- a/package.json +++ b/package.json @@ -68,8 +68,6 @@ "webpack-merge": "^5.8.0" }, "dependencies": { - "@pixi/compressed-textures": "^7.3.3", - "@pixi/core": "^7.3.3", "@types/stats": "^0.16.30", "@types/three": "^0.146.0", "commander": "^10.0.1", @@ -79,7 +77,7 @@ "js-to-ts-converter": "^0.18.2", "lodash": "^4.17.21", "pixi-basis-ktx2": "^0.0.17", - "pixi.js": "^7.3.3", + "pixi.js": "^7.x.x", "stats.js": "^0.17.0", "three": "^0.148.0", "zstddec": "^0.0.2" diff --git a/src/constants/constants.ts b/src/constants/constants.ts index 487e4bd..c188e49 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -1,3 +1,4 @@ +import _ from "lodash"; import { KTX2Types } from "../types/compressionTypes"; export const assetKtxEtc1sPath = './assets/KTX2_ETC1S' @@ -196,18 +197,24 @@ export const assetTexturePaths = [ ]; export const assetsKTXTestPaths = [ - './assets/ktx_test/x2Portrait.png', - './assets/ktx_test/x2Portrait-etc1s.ktx2', - './assets/ktx_test/x2Portrait-etc1s3.ktx2', - './assets/ktx_test/x2Portrait-uastc-high.ktx2', - './assets/ktx_test/x2Portrait-uastc-mid3.ktx2', - './assets/ktx_test/x2Portrait-uastc-high3.ktx2', - './assets/ktx_test/x2Portrait-uastc-high4.ktx2', - './assets/ktx_test/x2Portrait-uastc-mid3-zlib.ktx2', - './assets/ktx_test/x2Portrait-uastc-high3-zlib.ktx2', - './assets/ktx_test/x2Portrait-uastc-high4-zlib.ktx2' + './assets/ktxTest/x2Portrait.png', + './assets/ktxTest/x2Portrait-etc1s.ktx2', + './assets/ktxTest/x2Portrait-etc1s3.ktx2', + './assets/ktxTest/x2Portrait-uastc-high.ktx2', + './assets/ktxTest/x2Portrait-uastc-mid3.ktx2', + './assets/ktxTest/x2Portrait-uastc-high3.ktx2', + './assets/ktxTest/x2Portrait-uastc-high4.ktx2', + './assets/ktxTest/x2Portrait-uastc-mid3-zlib.ktx2', + './assets/ktxTest/x2Portrait-uastc-high3-zlib.ktx2', + './assets/ktxTest/x2Portrait-uastc-high4-zlib.ktx2' ]; +export const animTestPath = { + path: './assets/animTest/anematicDragonFire', + ext: 'jpg', + length: 16 +} + export const assetsSoundPaths = [ './assets/variant/ogg/soundHowl/soundAmbientBonus.ogg', './assets/variant/ogg/soundHowl/soundAmbientMain.ogg', @@ -320,4 +327,12 @@ export function getTextureAssetPaths(ktx2Type?: KTX2Types): string[] { return assetTexturePaths.map((item) => item.replace('./assets', texturePath).replace(/jpg|jpeg|png/g,'ktx2')); } return assetTexturePaths +} +export function getAnimationAssetPaths(ktx2Type?: KTX2Types): string[] { + const paths = _.times(animTestPath.length, (index) => `${animTestPath.path}${index + 1}.${animTestPath.ext}`); + if (ktx2Type) { + const texturePath = getKTX2TypePath(ktx2Type); + return paths.map((item) => item.replace('./assets', texturePath).replace(/jpg|jpeg|png/g,'ktx2')); + } + return paths; } \ No newline at end of file diff --git a/src/ktxTestView.ts b/src/ktxTestView.ts index 52c67cb..6589ecc 100644 --- a/src/ktxTestView.ts +++ b/src/ktxTestView.ts @@ -1,7 +1,8 @@ import * as Pixi from 'pixi.js'; -import { assetsKTXTestPaths } from './constants/constants'; +import { animTestPath, assetsKTXTestPaths, getAnimationAssetPaths } from './constants/constants'; import _ from 'lodash'; import { KTX2Types } from './types/compressionTypes'; +import { wait } from './utils/wait'; export class KTXTestView { private canvasApp: Pixi.Application; @@ -115,6 +116,38 @@ export class KTXTestView { }; } + public async createTestAnimation(spriteCount: number, type?: KTX2Types, animationSpeed = 1.0): Promise { + const spritePaths = getAnimationAssetPaths(type); + const textureArray: Pixi.Texture[] = []; + for (let i = 0; i < spritePaths.length; i++) { + const texture = await Pixi.Assets.load(spritePaths[i]); + texture.textureCacheIds = [spritePaths[i]]; + (texture as any).texture = texture; + console.error(texture instanceof Pixi.Texture); + textureArray.push(texture); + } + + for (let i = 0; i < 1; i++) { + //this._textureID = -1, this._textureTrimmedID = -1, this._cachedTint = 16777215, this.uvs = this._texture._uvs.uvsFloat32, this.updateAnchor && this._anchor.copyFrom(this._texture.defaultAnchor), this.onFrameChange && this.onFrameChange(this.currentFrame)) + // textureArray.forEach((tex) => console.error(tex._uvs, tex._uvs.uvsFloat32)); + const sprite = new Pixi.AnimatedSprite(textureArray); + console.error(i); + // console.error(i, logSprite._uvs.uvsFloat32, logSprite._previousFrame, logSprite._texture, logSprite._textureID, logSprite._textureTrimmedID, logSprite._cachedTint, logSprite.updateAnchor, logSprite._anchor, logSprite.onFrameChange); + sprite.scale.set(0.1); + sprite.anchor.set(0.5); + sprite.position.set( + _.random(sprite.width * 0.05, this.canvasApp.screen.width - sprite.width * 0.05), + _.random(sprite.height * 0.05, this.canvasApp.screen.height - sprite.height * 0.05)); + sprite.autoUpdate = true; + sprite.loop = true; + sprite.animationSpeed = animationSpeed; + sprite.play(); + + this.container.addChild(sprite); + this.sprites.push(sprite); + } + } + private async getFileSize(path: string): Promise{ const response = await fetch(path); const blob = await response.blob(); diff --git a/src/project.ts b/src/project.ts index cc2d6df..ce94dcb 100644 --- a/src/project.ts +++ b/src/project.ts @@ -260,11 +260,18 @@ export class Project implements IProject { this.logResults('KTX2 test loaded!'); }); - this.createButton('Add test sprites', this.loadContainer, 20 + scaleW + offset, offset + height * 4.5, scaleW, scaleH, async () => { + // this.createButton('Add test sprites', this.loadContainer, 20 + scaleW + offset, offset + height * 4.5, scaleW, scaleH, async () => { + // const imageExt = this.ktx2Type ? 'KTX2_' + this.ktx2Type.toUpperCase() :'PNG' + // this.logResults(`Loading 1000 ${imageExt} sprites...`); + // await this.ktxTestViewer.createTestSprites(1000, this.ktx2Type); + // this.logResults(`${imageExt} sprites loaded!`); + // }); + + this.createButton('Anim test', this.loadContainer, 20 + scaleW + offset, offset + height * 4.5, scaleW, scaleH, async () => { const imageExt = this.ktx2Type ? 'KTX2_' + this.ktx2Type.toUpperCase() :'PNG' - this.logResults(`Loading 1000 ${imageExt} sprites...`); - await this.ktxTestViewer.createTestSprites(1000, this.ktx2Type); - this.logResults('KTX2 sprites loaded!'); + this.logResults(`Loading 1000 ${imageExt} animation...`); + await this.ktxTestViewer.createTestAnimation(1000, this.ktx2Type, 0.4); + this.logResults(`${imageExt} animation loaded!`); }); } diff --git a/yarn.lock b/yarn.lock index cfd062e..c87811c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -253,28 +253,39 @@ __metadata: languageName: node linkType: hard -"@pixi/accessibility@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/accessibility@npm:7.3.3" +"@pixi/accessibility@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/accessibility@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/events": 7.3.3 - checksum: c832dde1567cbafb8cf2655b034f53b15d5d6e384b0a38f4a49305f01fc43a5c3eef477c5acf47e5e3729d7a507494b259fb6521e8bc46c1bef20fa42b1a3b4c + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/events": 7.4.0 + checksum: 3ed5e2a2637d9c942a974d6aae24d085951fca66751e1d1f8c5709ed71e65ec9327f4c9a1dc3471108992ee0acd6c8c59c5eea3cef653e4b073a9ce0945f372e languageName: node linkType: hard -"@pixi/app@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/app@npm:7.3.3" +"@pixi/app@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/app@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - checksum: 73f042aaed6715b70ff837abc9e288e7473c366e1eda24e68365199107eeb68d08be090356e09415846c82061d936694044b5b5e5cf33e61df015fbddd877037 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + checksum: 23eb9e2384e0aa40bc28094842fc08980980d1d57652e236ecdd4b1eb23314654f4a92d4c090fbe973f06d0499518bf3adfcf33dd422b823c3d7840529912c71 + languageName: node + linkType: hard + +"@pixi/assets@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/assets@npm:7.4.0" + dependencies: + "@types/css-font-loading-module": "npm:^0.0.12" + peerDependencies: + "@pixi/core": 7.4.0 + checksum: af229a3803b9fdf3360cfa7db264eb0709fcaa92e3c48854e24102bc19f09ef2867ac6982f849839c093beaa9c6a18b70ca06063d5d8459b1407168a196327ac languageName: node linkType: hard -"@pixi/assets@npm:7.3.3, @pixi/assets@npm:^7.3.3": +"@pixi/assets@npm:^7.3.3": version: 7.3.3 resolution: "@pixi/assets@npm:7.3.3" dependencies: @@ -294,6 +305,15 @@ __metadata: languageName: node linkType: hard +"@pixi/color@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/color@npm:7.4.0" + dependencies: + "@pixi/colord": "npm:^2.9.6" + checksum: b27132f33c900e9eb06bddb8b629dacb69b8b614e8437bc42d49cccbb377bee3259327fed769b1e908a2a96cbc94728ce4e395b42096bdc48832f42d20cf9c88 + languageName: node + linkType: hard + "@pixi/colord@npm:^2.9.6": version: 2.9.6 resolution: "@pixi/colord@npm:2.9.6" @@ -301,7 +321,17 @@ __metadata: languageName: node linkType: hard -"@pixi/compressed-textures@npm:7.3.3, @pixi/compressed-textures@npm:^7.3.3": +"@pixi/compressed-textures@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/compressed-textures@npm:7.4.0" + peerDependencies: + "@pixi/assets": 7.4.0 + "@pixi/core": 7.4.0 + checksum: d0d3d6a943f0bb741f7ce2e305fcd21e00f5725cfbb29a8bd8aeebc8af0ee745895273d7f2d178cbcf2bbf70f6f5d4f56e1aa23d95e0d7dff55764314bdb5bea + languageName: node + linkType: hard + +"@pixi/compressed-textures@npm:^7.3.3": version: 7.3.3 resolution: "@pixi/compressed-textures@npm:7.3.3" peerDependencies: @@ -318,7 +348,30 @@ __metadata: languageName: node linkType: hard -"@pixi/core@npm:7.3.3, @pixi/core@npm:^7.3.3": +"@pixi/constants@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/constants@npm:7.4.0" + checksum: 9aa9c58047d971438bb3ac387bfc29eaf2cb2b8c064a236b9d016ee98675976344613a9be39b93e2f45c7a2aa87a7338673f4f53605f96bbc0250fe31d9756e2 + languageName: node + linkType: hard + +"@pixi/core@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/core@npm:7.4.0" + dependencies: + "@pixi/color": "npm:7.4.0" + "@pixi/constants": "npm:7.4.0" + "@pixi/extensions": "npm:7.4.0" + "@pixi/math": "npm:7.4.0" + "@pixi/runner": "npm:7.4.0" + "@pixi/settings": "npm:7.4.0" + "@pixi/ticker": "npm:7.4.0" + "@pixi/utils": "npm:7.4.0" + checksum: 6b8f70ab1fea63528caf0d2a9db22082f5ffd871b931882468e74d18d65eea3ba135d66b37bfdc62ce633fe37aa32f8a5d3e928291ec77552a581a4fcf9796f3 + languageName: node + linkType: hard + +"@pixi/core@npm:^7.3.3": version: 7.3.3 resolution: "@pixi/core@npm:7.3.3" dependencies: @@ -335,22 +388,22 @@ __metadata: languageName: node linkType: hard -"@pixi/display@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/display@npm:7.3.3" +"@pixi/display@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/display@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: d59ffce30f23060d741349ad81805bbe06c61af573d1ae36c8e2437abe9dbb110ca40ccbdbc2fa27e052f595c68616fe6f50b3ffeee2d686032078d6b0604303 + "@pixi/core": 7.4.0 + checksum: 33d563be011b78c4e855a2e2f8e96c42d26cfb810d4e8a77181ee3e46bf5e1c731f52c0b845e85d5e50f6fc212103770cb2a25335621de6b8bd42aff0b4a3a19 languageName: node linkType: hard -"@pixi/events@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/events@npm:7.3.3" +"@pixi/events@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/events@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - checksum: e097ac5d9df51523a1bf271c8e661ff3002540e432cbeb90f8abaf68b9fece836618d7b641a2a71d6cd49f7913e3fd656a2230daca1a0f90271ee17168a620bb + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + checksum: 55057bb804565a030163bb15f579d024fa2f99b974efd93b9dcf92fd1a1052121669cdc231155560dc09b9a96d69193e4d73deaa6ca83af5dde927b871d1cfd0 languageName: node linkType: hard @@ -361,77 +414,84 @@ __metadata: languageName: node linkType: hard -"@pixi/extract@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/extract@npm:7.3.3" +"@pixi/extensions@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/extensions@npm:7.4.0" + checksum: e7f2d2e5b92c8420cc99154ff3291607dbb6ac34216a990c74afb348fe001fd79493dd07d88c74e4a4b6261d881c40abe2f5943be910b4b3ae6ddf0778479c25 + languageName: node + linkType: hard + +"@pixi/extract@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/extract@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: 252f5865081e0d9f1f4918be1c9f7cba3c0266b55d49b38ed50eeeee22c8d55a113e0840cc89248a02e72c35f72f763a9cc157b3220e6a9f4f02f0ac07f9b77c + "@pixi/core": 7.4.0 + checksum: 4b255ae813e271e2fce0e60f24b4f4f738f2de6ae8628f555b271bf43e63d023d790e259c3537f15b23ea19eff56125b705570d2fba78a5bfcfc6898155bdb7f languageName: node linkType: hard -"@pixi/filter-alpha@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-alpha@npm:7.3.3" +"@pixi/filter-alpha@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-alpha@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: 3c3f6e347c4269c9d7f4738aef77856327eaf50be2eddd4c9379105c84b7b9fc7db98083b46d7303f58caf7024056f8034c3b5538f229da9acd721a143cacdeb + "@pixi/core": 7.4.0 + checksum: ff530823f7088aeb461157bbee093b0ce85171b4de7756d49ab0e2e80d3f72300783c1e042e80b2901e7fd447d61d46815104346054a231352a8303eecd68279 languageName: node linkType: hard -"@pixi/filter-blur@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-blur@npm:7.3.3" +"@pixi/filter-blur@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-blur@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: 3ac7983e7a902b4049500bb9ea1f53e3e6bc0129b38b3a0b8f0f5b1965cd7a7b3de9732be018d25bfd08969025acc51eec0d68bf84b5e34022bce9aabeabd6a5 + "@pixi/core": 7.4.0 + checksum: 874d9705227cad598c9489698f49e0d364310777fc4ff402f06e674fa7789cb18c2383af6ebec07a5d3711dc145eb2998411c09c7c92e05cb561a267135264a5 languageName: node linkType: hard -"@pixi/filter-color-matrix@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-color-matrix@npm:7.3.3" +"@pixi/filter-color-matrix@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-color-matrix@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: d2dc320ba55f848b562cf062bd05359eefa62112b17d13a365b954e6ef1aecc2743bbb43f7f3fdcb281b05121fb767f27c8bd216f05bbbad044a05e5a843b063 + "@pixi/core": 7.4.0 + checksum: 7bd5bb702229287b2a3164132a7ac98db4b680c5dc7590e9697a2c43fd7994c9007a3ae7dcd4bb8676f2b20dfb34492c41a5237d8e8b4b9690cd07c2270dd374 languageName: node linkType: hard -"@pixi/filter-displacement@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-displacement@npm:7.3.3" +"@pixi/filter-displacement@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-displacement@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: 586e0a0cde63fdf950c4da10f05208f627a4811fb65cd8d145e94742d6d5160a685cfec86dab2ac3864fd70a08b1b1a722363bb1ff68ea56d8d3d3db7fedf8b0 + "@pixi/core": 7.4.0 + checksum: d3089423a1a2cb6d0209ab25d3e4ca9dfa49c364c6342ca7f0df6d354bc9c75731cccd12d946575e71ab0e0410cd8bad5cda5c0358efef2853094441c43fff67 languageName: node linkType: hard -"@pixi/filter-fxaa@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-fxaa@npm:7.3.3" +"@pixi/filter-fxaa@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-fxaa@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: 1c04ca3f576a62e1beef67f33cd0b8f4248d7072e3f5eabef77ca4ea05b20eeb2803dd48f17b73ef9929be54f662ef5bccfff3e3f665daac3fc95929124f8e61 + "@pixi/core": 7.4.0 + checksum: d692063985b74a8f1bd849886bcce22a56cbc2da020fe4eec9b6d3e1ab11af9e6596b008f694438a67f3e205ffde4f2c95b6d132339d234cdae04d0dfc2fe68e languageName: node linkType: hard -"@pixi/filter-noise@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/filter-noise@npm:7.3.3" +"@pixi/filter-noise@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/filter-noise@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - checksum: b917788d060c66403888a88f527627266725dc59501c49dc0df29de62ca70b573d2240f79c877559a648fe68eb471eb0ed74ad92358610f65a3ec8b7cf41cbba + "@pixi/core": 7.4.0 + checksum: e89c9b309b4fd99a1642f898b6042f62b405fae8c7bf2692f7489fa0bc5f96096f204715c6d923aa8fe16174803db942fe9600f5a98c68b5a07172f38847e65f languageName: node linkType: hard -"@pixi/graphics@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/graphics@npm:7.3.3" +"@pixi/graphics@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/graphics@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 952b6bf0df1a511a21d96cca7dc3febaa946082457347a394d4bb4e8426589c4399a17ef90aacb620c1385605e5c57a3dcee89e2a95c436ede3092459ae4f46a + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: 9cecd39b80b67b2b9eab970c4f4a19445ec2d06c3833a0d9f710d04d1ebc00c58d132cf481e028f61cf7b7043b69e0a90db777067b6e6df381f2a189303ae69e languageName: node linkType: hard @@ -442,76 +502,83 @@ __metadata: languageName: node linkType: hard -"@pixi/mesh-extras@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/mesh-extras@npm:7.3.3" +"@pixi/math@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/math@npm:7.4.0" + checksum: 1b2a2ac2c935709ae09345b58fe2bbeb643cfb041490c4fc3bda5894a5cad004ce994163d9464502b49fa1c6c9cddcc2bba9b9b23d26b1a2871490b39d08b20e + languageName: node + linkType: hard + +"@pixi/mesh-extras@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/mesh-extras@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/mesh": 7.3.3 - checksum: c392b990cdfc5e2a64848ff31123a7743dd57a6ca87e298cbc3881e88aa14e44410354593408d1fc00158f197f42465d15570c98e866a344bc725e8ba310bf65 + "@pixi/core": 7.4.0 + "@pixi/mesh": 7.4.0 + checksum: 669c1de0c1971c0f9be65730ed16c24522c78f324f8af06ebe0dae177dcb3becbd5afd743f4719b638472d37f25804bf21df5f3067127cdf761a6d7431742610 languageName: node linkType: hard -"@pixi/mesh@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/mesh@npm:7.3.3" +"@pixi/mesh@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/mesh@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - checksum: 902b50ac0ad9a7ad95e77f83b49ea684e0cc160a8bca89f9fe9f5b157ae7375ffb3ccd542d8a79972423cebda0307cbb76eb4cc6c030abfc404ac10b98b4de02 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + checksum: efad47bd2a1a9b7817cdc20fc06856b5e186eecb68faf3254e1e95e191d61a9ad0cc5e839f2e808d474ac49cd387bed24d39dd70f38f53a4a473164bf79f28d2 languageName: node linkType: hard -"@pixi/mixin-cache-as-bitmap@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/mixin-cache-as-bitmap@npm:7.3.3" +"@pixi/mixin-cache-as-bitmap@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/mixin-cache-as-bitmap@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 87beb527f8fb5d7e8090c339ffe7bdb6e6b7387538c63dabea8def45dbce21293adb7e2c79739a6c4b4ffaef34b0853d37cb5c4c7134a774de79c5be3a52b305 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: 4460adf983f616119d5c3ebdcac20e9dfa2dad294178b561dd4ede615277030252f792750ba9ced17f247d34c165cfbc1b4db541d2b5e7a0597254d837c31a0f languageName: node linkType: hard -"@pixi/mixin-get-child-by-name@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/mixin-get-child-by-name@npm:7.3.3" +"@pixi/mixin-get-child-by-name@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/mixin-get-child-by-name@npm:7.4.0" peerDependencies: - "@pixi/display": 7.3.3 - checksum: d65127ad0ebb148e76d918a2a6817fd34ca2c801c7ecb46f86ff74172467fe4349809f776f160387231d32736e7ad322f8218f71818755aaf063560cb3bc6331 + "@pixi/display": 7.4.0 + checksum: aeaa6fa7d6457c8f0c8c41681456af8441fe4d38e913f0d324a031c29ebf11e3a251dabaeba958fa3ab9d57728fe435e707cffadd83fb0c193d4bf71873a286d languageName: node linkType: hard -"@pixi/mixin-get-global-position@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/mixin-get-global-position@npm:7.3.3" +"@pixi/mixin-get-global-position@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/mixin-get-global-position@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - checksum: ee784ecf3186bddfd942cb4e3bb31639012639753db32bfcab22c996bd0e4845478c61b4b108ae67f294f0345aee72968a84030dcf04291bd44a4113192b899a + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + checksum: 8e13785b54b94acae738d1f27757411fe55c35085ebe5b234ded0cea4d13cbb3406077e997f86c9f91c8c9f971bd9f4a3861ddeac5c792931bb214c60feae622 languageName: node linkType: hard -"@pixi/particle-container@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/particle-container@npm:7.3.3" +"@pixi/particle-container@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/particle-container@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 5d6b93008d561e40664f556c927145bdb858853e7d752c7750a35b17471f80c74c84adf706fc775e87e94d8aebb8759028a65ba47ba3b1883cc5e1888beb081f + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: e459afa9afbe99de366cf02613f1a9f3736fae5b5621ce5334ae3861dc2db5f48d8a219f4f517f7ba79f9f18d87a023a5444584f25c2feebe94a0fd6d094a650 languageName: node linkType: hard -"@pixi/prepare@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/prepare@npm:7.3.3" +"@pixi/prepare@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/prepare@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/graphics": 7.3.3 - "@pixi/text": 7.3.3 - checksum: 9413e07c40f5fc0bb827753aacdf0195453eeef0257473f85fb5b3ec102bb52df5430b0e8e2d3a845f843f51d078e8e2e714d5f2aaadaea68e52aa81c0e94a34 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/graphics": 7.4.0 + "@pixi/text": 7.4.0 + checksum: 103f3ef57a0575df37fd2c3e8f233b02ff43002f69adfaa1b95a558553bac7b13c3eb3743a6ee4ab103dd69c92e1d05c295cdaa81ee79aac9b1a240fd24f8776 languageName: node linkType: hard @@ -522,6 +589,13 @@ __metadata: languageName: node linkType: hard +"@pixi/runner@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/runner@npm:7.4.0" + checksum: 8dc16d3e9fc02a314b8e6176b33b7facbdb007aa13eaca840955544ac14e8cd6c5e359e49965e4af21be0121695df1bc033ded082876ec6bbbed714d4376d92b + languageName: node + linkType: hard + "@pixi/settings@npm:7.3.3": version: 7.3.3 resolution: "@pixi/settings@npm:7.3.3" @@ -533,79 +607,90 @@ __metadata: languageName: node linkType: hard -"@pixi/sprite-animated@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/sprite-animated@npm:7.3.3" +"@pixi/settings@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/settings@npm:7.4.0" + dependencies: + "@pixi/constants": "npm:7.4.0" + "@types/css-font-loading-module": "npm:^0.0.12" + ismobilejs: "npm:^1.1.0" + checksum: 5810c6fe620b08e89dbff4ff6829c9cdfd8be2d00c182878cb408e3706ff412111781ac2c764e793ad4181b19499ceefe3c789ede94fed17afb3dda9b7397248 + languageName: node + linkType: hard + +"@pixi/sprite-animated@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/sprite-animated@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 1cf94e24ca54f22c28dd57ec6b79f58b90c2b57a7c3176e356e046a3b5ce12395aaa91fd9e5fd9dbc52f7e49a4f021f4ddc581050b94da5b0a9da6a72014d9df + "@pixi/core": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: 09edd78776a5b557f7fd694882d7a8e8a7ccaf214d52fc13cd776a798c254589553e97ff395040d1a61e62a1d27f06ee98462135a2036214a59f144f94280a99 languageName: node linkType: hard -"@pixi/sprite-tiling@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/sprite-tiling@npm:7.3.3" +"@pixi/sprite-tiling@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/sprite-tiling@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 1a59a4b061f1c04c964def36af2f3a3c16f0b4e3f2a2d6999752e23cb5a93f37646f75738ef4e6a7735b99ce77e438aea342bf969d5e066106c94b9d428a010b + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: 82dad501f2b03550f37c0f27d336b9417531740342ac5a577f2836735014a396515c2a92e5f91c69f732ffea9d281037da51f981423a22083d589ce32f8df861 languageName: node linkType: hard -"@pixi/sprite@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/sprite@npm:7.3.3" +"@pixi/sprite@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/sprite@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - checksum: 1816e7fd2b9484b1bf702c17aad90a060b8c6c21c3e0316caab7fb094f54ade7acedeec310a4d356e8a776da476a69ca9c906a9c74dde3f4bf9a2e1e728516ed + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + checksum: 24bfb9bfd817c20b7838cd85ebc48e4c4fac45ee8bd253b890ec8cdac8a1689ba937e7d12163067ab08a1171ab975f7d829a4b5f773dbeb261330a729575d2ae languageName: node linkType: hard -"@pixi/spritesheet@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/spritesheet@npm:7.3.3" +"@pixi/spritesheet@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/spritesheet@npm:7.4.0" peerDependencies: - "@pixi/assets": 7.3.3 - "@pixi/core": 7.3.3 - checksum: 62055b59ebc5c6e519e47e0312e3d48be039cf1a4a81471308a6d2596a6171483542eab8f40e09a60e1bedaddb05cb1ae81b9243df50dc253d8f365de99d3e19 + "@pixi/assets": 7.4.0 + "@pixi/core": 7.4.0 + checksum: a3ed87cdfb564924f57c8613bac9a60d30a7996555e0c6bb48e30e83d9f8a7b490ee1569b42ad1627bc166860af981bf700e85744576aaf67670822837716b55 languageName: node linkType: hard -"@pixi/text-bitmap@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/text-bitmap@npm:7.3.3" +"@pixi/text-bitmap@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/text-bitmap@npm:7.4.0" peerDependencies: - "@pixi/assets": 7.3.3 - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/mesh": 7.3.3 - "@pixi/text": 7.3.3 - checksum: 3af9996d3ade42a549a74bd5de95bbb465aa13d9ce35823715191f813a9a73e3d54fd0ebf9a69f6ddedab11c4d4e9cb21f1fac329ee6bec595a6b59cf8558725 + "@pixi/assets": 7.4.0 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/mesh": 7.4.0 + "@pixi/text": 7.4.0 + checksum: 97f1a3f79540ac0f19746a0f1b9915337357dfef64298a6688b50b5af6a0d2fc8ef5ac9dfb20c22dd929c9c1b92d09bc6e4f262a97760f4a683669e9d4814f1c languageName: node linkType: hard -"@pixi/text-html@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/text-html@npm:7.3.3" +"@pixi/text-html@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/text-html@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/display": 7.3.3 - "@pixi/sprite": 7.3.3 - "@pixi/text": 7.3.3 - checksum: e81e1a7ebe0f18514d23541321841082a0b628ac36bbcd582b5a6f26c99c34bc2c8f6dcdbb16c6918b4be4a58d1e0ca6633cd14397a0f059de21a56a9dfba7e5 + "@pixi/core": 7.4.0 + "@pixi/display": 7.4.0 + "@pixi/sprite": 7.4.0 + "@pixi/text": 7.4.0 + checksum: e73739122225fadfac0488f83f50705322375b962abc09eb8737fb9d38203d8f4c796930c142dcbef0fc8cab30b45e7450230a719dbb964d750adc8d1df6f432 languageName: node linkType: hard -"@pixi/text@npm:7.3.3": - version: 7.3.3 - resolution: "@pixi/text@npm:7.3.3" +"@pixi/text@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/text@npm:7.4.0" peerDependencies: - "@pixi/core": 7.3.3 - "@pixi/sprite": 7.3.3 - checksum: 4ef27e761ed902a719b00253b7ba299396c993e1d4406e03095a80749b05a2d18052e05a1b8e6b7a45f9fef651dae6ba86d288841edfabc6fe2bf1719c1962fa + "@pixi/core": 7.4.0 + "@pixi/sprite": 7.4.0 + checksum: 0c3a13e084a43b12dd2f76a30c6ad7e5bedc98a9d7ef6447a5b850f4d958f71bc95399ba64f947c1931fcfab6a3b4e1eadf2d745d9de89f2bb805a2687582946 languageName: node linkType: hard @@ -620,6 +705,17 @@ __metadata: languageName: node linkType: hard +"@pixi/ticker@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/ticker@npm:7.4.0" + dependencies: + "@pixi/extensions": "npm:7.4.0" + "@pixi/settings": "npm:7.4.0" + "@pixi/utils": "npm:7.4.0" + checksum: 54e7ba774cce0bb352effec6935c6af9ac6d949ae8c2df98146107b790e4ebef77f3f75868cb3c5027881f0e3db5df7cfec0e9a4c5c2397ee6c90c0320322459 + languageName: node + linkType: hard + "@pixi/utils@npm:7.3.3": version: 7.3.3 resolution: "@pixi/utils@npm:7.3.3" @@ -635,6 +731,21 @@ __metadata: languageName: node linkType: hard +"@pixi/utils@npm:7.4.0": + version: 7.4.0 + resolution: "@pixi/utils@npm:7.4.0" + dependencies: + "@pixi/color": "npm:7.4.0" + "@pixi/constants": "npm:7.4.0" + "@pixi/settings": "npm:7.4.0" + "@types/earcut": "npm:^2.1.0" + earcut: "npm:^2.2.4" + eventemitter3: "npm:^4.0.0" + url: "npm:^0.11.0" + checksum: 2f2cd2665585364b042556de10ed70858c84eafc0bbbb0f46ace059d468c16606b5e0f51842260535c360404b4efabbab1862cfb5b04247e5ea4f284ac47638d + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -7611,41 +7722,41 @@ __metadata: languageName: node linkType: hard -"pixi.js@npm:^7.3.3": - version: 7.3.3 - resolution: "pixi.js@npm:7.3.3" - dependencies: - "@pixi/accessibility": "npm:7.3.3" - "@pixi/app": "npm:7.3.3" - "@pixi/assets": "npm:7.3.3" - "@pixi/compressed-textures": "npm:7.3.3" - "@pixi/core": "npm:7.3.3" - "@pixi/display": "npm:7.3.3" - "@pixi/events": "npm:7.3.3" - "@pixi/extensions": "npm:7.3.3" - "@pixi/extract": "npm:7.3.3" - "@pixi/filter-alpha": "npm:7.3.3" - "@pixi/filter-blur": "npm:7.3.3" - "@pixi/filter-color-matrix": "npm:7.3.3" - "@pixi/filter-displacement": "npm:7.3.3" - "@pixi/filter-fxaa": "npm:7.3.3" - "@pixi/filter-noise": "npm:7.3.3" - "@pixi/graphics": "npm:7.3.3" - "@pixi/mesh": "npm:7.3.3" - "@pixi/mesh-extras": "npm:7.3.3" - "@pixi/mixin-cache-as-bitmap": "npm:7.3.3" - "@pixi/mixin-get-child-by-name": "npm:7.3.3" - "@pixi/mixin-get-global-position": "npm:7.3.3" - "@pixi/particle-container": "npm:7.3.3" - "@pixi/prepare": "npm:7.3.3" - "@pixi/sprite": "npm:7.3.3" - "@pixi/sprite-animated": "npm:7.3.3" - "@pixi/sprite-tiling": "npm:7.3.3" - "@pixi/spritesheet": "npm:7.3.3" - "@pixi/text": "npm:7.3.3" - "@pixi/text-bitmap": "npm:7.3.3" - "@pixi/text-html": "npm:7.3.3" - checksum: 56cef6b8113d63ee75b793f5020e2d2f5baa7b990b24a81feff87f9288e9588ad3100b8d3f31344819c9a0966e9bff8179f78ea171e03c83c317b53d5ef70155 +"pixi.js@npm:^7.x.x": + version: 7.4.0 + resolution: "pixi.js@npm:7.4.0" + dependencies: + "@pixi/accessibility": "npm:7.4.0" + "@pixi/app": "npm:7.4.0" + "@pixi/assets": "npm:7.4.0" + "@pixi/compressed-textures": "npm:7.4.0" + "@pixi/core": "npm:7.4.0" + "@pixi/display": "npm:7.4.0" + "@pixi/events": "npm:7.4.0" + "@pixi/extensions": "npm:7.4.0" + "@pixi/extract": "npm:7.4.0" + "@pixi/filter-alpha": "npm:7.4.0" + "@pixi/filter-blur": "npm:7.4.0" + "@pixi/filter-color-matrix": "npm:7.4.0" + "@pixi/filter-displacement": "npm:7.4.0" + "@pixi/filter-fxaa": "npm:7.4.0" + "@pixi/filter-noise": "npm:7.4.0" + "@pixi/graphics": "npm:7.4.0" + "@pixi/mesh": "npm:7.4.0" + "@pixi/mesh-extras": "npm:7.4.0" + "@pixi/mixin-cache-as-bitmap": "npm:7.4.0" + "@pixi/mixin-get-child-by-name": "npm:7.4.0" + "@pixi/mixin-get-global-position": "npm:7.4.0" + "@pixi/particle-container": "npm:7.4.0" + "@pixi/prepare": "npm:7.4.0" + "@pixi/sprite": "npm:7.4.0" + "@pixi/sprite-animated": "npm:7.4.0" + "@pixi/sprite-tiling": "npm:7.4.0" + "@pixi/spritesheet": "npm:7.4.0" + "@pixi/text": "npm:7.4.0" + "@pixi/text-bitmap": "npm:7.4.0" + "@pixi/text-html": "npm:7.4.0" + checksum: bdec19f6d20efc9f489c848d10b86ebee5ba99094f53718d8ca820de03d9f3d9fdde01042af19ecab7b2117e8ddf70f163bd0ed673e48e38a405b5ec9c8478f8 languageName: node linkType: hard @@ -10658,8 +10769,6 @@ __metadata: resolution: "zip-unzip-ktx2@workspace:." dependencies: "@babel/polyfill": "npm:^7.12.1" - "@pixi/compressed-textures": "npm:^7.3.3" - "@pixi/core": "npm:^7.3.3" "@types/clean-webpack-plugin": "npm:^0.1.3" "@types/copy-webpack-plugin": "npm:^8.0.0" "@types/howler": "npm:^2.2.7" @@ -10701,7 +10810,7 @@ __metadata: node-polyfill-webpack-plugin: "npm:^1.1.4" npm-run-all: "npm:^4.1.5" pixi-basis-ktx2: "npm:^0.0.17" - pixi.js: "npm:^7.3.3" + pixi.js: "npm:^7.x.x" prettier: "npm:^2.3.2" stats.js: "npm:^0.17.0" terser-webpack-plugin: "npm:^5.1.4"