From ed8143f7eefc38acb0586bed7199a4a280dbcb90 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 11 Apr 2022 02:33:01 -0400 Subject: [PATCH 1/4] Bump renderer version --- package.json | 2 +- yarn.lock | 223 ++++++++++++++++++++++----------------------------- 2 files changed, 97 insertions(+), 128 deletions(-) diff --git a/package.json b/package.json index d188851d..882552c8 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@nitrots/nitro-renderer": "^1.1.23", + "@nitrots/nitro-renderer": "^1.2.0", "animate.css": "^4.1.1", "classnames": "^2.3.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 52c8473e..57768e2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1450,17 +1450,45 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@nitrots/nitro-renderer@^1.1.23": - version "1.1.23" - resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.1.23.tgz#a45107beb07beefce5de8a6215f6a35e11f79d2f" - integrity sha512-diFiEE0u3flvKA7FitCnoKy1h+4eQuwnc9wcJlesxGHuXoySkOsuQC96qqPfnyz0WZrYxlybr14HZPyKMtTsYA== +"@nitrots/nitro-renderer@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.2.0.tgz#b2cb6a766159b49d2791323d0aabde1f6dc44ecf" + integrity sha512-R8g/NDwv4RtZEgJGDKck0l42ey5OZCPDRgVoOg0ETPChS2jiahOwc7/x4EebEql80gXKjPVwuyuqgrsFEIi1jA== dependencies: + "@pixi/app" "^6.3.0" + "@pixi/basis" "^6.3.0" + "@pixi/canvas-display" "^6.3.0" + "@pixi/canvas-extract" "^6.3.0" "@pixi/canvas-renderer" "^6.3.0" + "@pixi/constants" "^6.3.0" + "@pixi/core" "^6.3.0" + "@pixi/display" "^6.3.0" + "@pixi/events" "^6.3.0" "@pixi/extract" "^6.3.0" "@pixi/filter-adjustment" "^4.1.3" + "@pixi/filter-alpha" "^6.3.0" + "@pixi/filter-color-matrix" "^6.3.0" + "@pixi/graphics" "^6.3.0" + "@pixi/graphics-extras" "^6.3.0" + "@pixi/interaction" "^6.3.0" + "@pixi/loaders" "^6.3.0" + "@pixi/math" "^6.3.0" + "@pixi/math-extras" "^6.3.0" + "@pixi/mixin-cache-as-bitmap" "^6.3.0" + "@pixi/mixin-get-child-by-name" "^6.3.0" + "@pixi/mixin-get-global-position" "^6.3.0" + "@pixi/polyfill" "^6.3.0" + "@pixi/runner" "^6.3.0" + "@pixi/settings" "^6.3.0" + "@pixi/sprite" "^6.3.0" + "@pixi/sprite-tiling" "^6.3.0" + "@pixi/spritesheet" "^6.3.0" + "@pixi/text" "^6.3.0" + "@pixi/ticker" "^6.3.0" "@pixi/tilemap" "^3.2.2" + "@pixi/utils" "^6.3.0" + gifuct-js "^2.1.2" pako "^2.0.4" - pixi.js "^6.3.0" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1499,44 +1527,54 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@pixi/accessibility@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/accessibility/-/accessibility-6.3.0.tgz#fe843d6080fa263d01dcb3c1adad00fc42cafb75" - integrity sha512-G2IJovkixJ3MdXC456e7Nu9J2nLte01KwJPkWhhuuZkRQI6gBcLHn5flGG+QVx/dZDLySXyHiJ+1MAQ8kI9AbA== - -"@pixi/app@6.3.0": +"@pixi/app@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/app/-/app-6.3.0.tgz#9d8cb89e01b8a92c20700aa7d289e7ebc3f59be6" integrity sha512-Ud+D/VkGFCx9Z+i0OXDzXqT3zNrUJ9f3sZuoACz1VVD6nnSq+wBZPnyoOOsgfiMYo/0KYVJh+EdBKZS8aYnnVQ== +"@pixi/basis@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@pixi/basis/-/basis-6.3.0.tgz#09afb9b2f5cdd453ec550859aa34cc042e515d00" + integrity sha512-vSZSJUFj8fHwdU7pKcHlxZNQN92CEj1G6FiWhuoEGzIGKg00BTkJ4EapiimfauA7BCF6wqJpYjNSGAtYCdPzgw== + +"@pixi/canvas-display@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@pixi/canvas-display/-/canvas-display-6.3.0.tgz#41fea0e555cfd39ee7a7fb4f205471fc190acd63" + integrity sha512-M47bfxT9Imt68rz6VGfFSr1+LwiZRr0n9Ro40na4XsPHgTSG+dmkCA5fz6oSjQ2Z4VNv/jl4ehIlABWMJBu58A== + +"@pixi/canvas-extract@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@pixi/canvas-extract/-/canvas-extract-6.3.0.tgz#c9d0e471c103bfe3b0be174a4d041c73aef28fa2" + integrity sha512-+QQd8yTE83IUPcuEQKvtQi0hS3l8W6VP0UfdD2zhIAi/i17lZw+omWZ86Lifhj1RIE2OUIGNSvansIUrGyD2uA== + "@pixi/canvas-renderer@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/canvas-renderer/-/canvas-renderer-6.3.0.tgz#54e2cc71fff5a3072dc68e67516524c6c8aa05ed" integrity sha512-i/qAm7E8Wti4OFcOtU5PP2/w1YZcLspfg0zW2z6fUAFZfCgNrh5DdhLT04JY9wpgz990vg0NI1wjPPh1jHDjIA== -"@pixi/compressed-textures@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/compressed-textures/-/compressed-textures-6.3.0.tgz#a058043d03704f717f9ddfa527fb3947290ff782" - integrity sha512-Y/SHGQZftvSM98/m89a1Pf99c9L5TGEPngueOcmjCABeGI33vOaL2VM4chkHXhG9HLqrHYAty24vXqOj42LbJw== - -"@pixi/constants@6.3.0": +"@pixi/constants@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/constants/-/constants-6.3.0.tgz#c900b875ee132d7061af4c1ab53c060faec1a504" integrity sha512-295/bb0+5IugA9plqBnD6xrvApjgGRdaNJ6EryCa7UB2j8wt4YtuzLjNeaCtng9eJONgJXXPhPF85+spdWRMbg== -"@pixi/core@6.3.0": +"@pixi/core@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/core/-/core-6.3.0.tgz#f0eeb6804f811f7de59e32130590f82c4b930745" integrity sha512-j7UMizcgDoUB9eDrZIP22xJCPYpjx2/BCl8deE5M9Cim9OR2qPxnNnt3jC1oKf2vVnNMTDrMOLekhMVo89FX2Q== dependencies: "@types/offscreencanvas" "^2019.6.4" -"@pixi/display@6.3.0": +"@pixi/display@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/display/-/display-6.3.0.tgz#82781587c928ac49ea24dbc675781e885d3c4a08" integrity sha512-Uxc1aLTFzV55d3kOlh/g19RlE2okPXsroi5jfYGCNS0VCdFk0sp6jMNEwk12BwC0KcA5SU7217H4jLy38VCVpA== -"@pixi/extract@6.3.0", "@pixi/extract@^6.3.0": +"@pixi/events@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@pixi/events/-/events-6.3.0.tgz#56d5de336f9d4debdd1ec85de4c5761aff0cc3de" + integrity sha512-Cjg5fHS2jbYTGg+jYMMU2ql0WpVWol/FWRQAde6ELXxNq+R6kz7/HDal2dYH52wu541PR6ZSaAASzB2wrIzZ4g== + +"@pixi/extract@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/extract/-/extract-6.3.0.tgz#ee1f4eaa933e98c2c54930bb0c1b3f3935e4b1ad" integrity sha512-p5d3Jx0hoIQZsn1msIOyYCzyRjVkfiDUNkuzpLmNo9zng7C6bwqmIZWEMr5alm7+XwqKHlQdsBuK9PeUJt9fGQ== @@ -1546,87 +1584,62 @@ resolved "https://registry.yarnpkg.com/@pixi/filter-adjustment/-/filter-adjustment-4.1.3.tgz#61e34b4dd9766ccf40463f0538201bf68f78df66" integrity sha512-W+NhPiZRYKoRToa5+tkU95eOw8gnS5dfIp3ZP+pLv2mdER9RI+4xHxp1uLHMqUYZViTaMdZIIoVOuCgHFPYCbQ== -"@pixi/filter-alpha@6.3.0": +"@pixi/filter-alpha@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/filter-alpha/-/filter-alpha-6.3.0.tgz#3585bfe8a215fb13f56352d34dee2243fd8651ad" integrity sha512-FyO35T2ym7R/rxaQzz3+dfpMlNn7b4XCFebD7hAgYoLqb+/vaM32ZjjoKBxxFRFqpZxBO6BObCyJQd245h+P4A== -"@pixi/filter-blur@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/filter-blur/-/filter-blur-6.3.0.tgz#7ac975c8e011201159afcca70b67966e5dfcde6e" - integrity sha512-TpQxBbFnkcAxMOInMZDprRPXlfhQ0tYOvbnmdDbVTEGOqDXY/7do0bYRfsNshAyeyGE4NVIks1S/RlGkzHLhBg== - -"@pixi/filter-color-matrix@6.3.0": +"@pixi/filter-color-matrix@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/filter-color-matrix/-/filter-color-matrix-6.3.0.tgz#bf6795960c4c1b608bf92c5f513b5e60b1888754" integrity sha512-9qKrRiaeINap7BgolI3GZ5RaRgYNx0pK8iyrn7vWcuQAxR/lPM+rfgWQPagjXdU9NbnbnfZj0LNOmgFqtWsZTQ== -"@pixi/filter-displacement@6.3.0": +"@pixi/graphics-extras@^6.3.0": version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/filter-displacement/-/filter-displacement-6.3.0.tgz#5b529f60878ba06b669535f52abc897df34b447d" - integrity sha512-zjOnM3fVh4HOxEHzG/iN00ZmxCuZdxy+xTnjUZkbOgmXtDqRa9HakCBHlg60ZpF/NiIAkJNdrXx6nDhh2hve8Q== + resolved "https://registry.yarnpkg.com/@pixi/graphics-extras/-/graphics-extras-6.3.0.tgz#940319377b8ec17acaeae370a0b9010fb2988a59" + integrity sha512-XsRZSRY4Jyhlc2Df6is43OfSBPwICXceczSeOcWx7juRQ8rwGVZLfaKEgBQtTs4++MOBTTIY8BrXqJ0yJOaS1w== -"@pixi/filter-fxaa@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/filter-fxaa/-/filter-fxaa-6.3.0.tgz#e2d6864740f24c917e91f60f3776466f82f8baec" - integrity sha512-dKhKNmQ8zgtvcT2s7nDU/0LETaCzydgosXAeEPO5XtkHA6asffjEAqiie9wpj3DzODOibNuC/wpiiwGmN6xGgw== - -"@pixi/filter-noise@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/filter-noise/-/filter-noise-6.3.0.tgz#dc1608cf9cd432e1e7020baed4fa05013a296a8a" - integrity sha512-+2qhb/wWkqI86xb2+NMxeoKUiA5Kx6Kvo1jCvSE4PdP5CGCFDLQqnj0NkIZCbl/3L0MiM9vy+JRmY+nVgre8Tw== - -"@pixi/graphics@6.3.0": +"@pixi/graphics@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/graphics/-/graphics-6.3.0.tgz#50e758385b7704d0a068db189a20f0244f5fd68d" integrity sha512-cnce8ddZSRgVuwK3hdWjEgf9WJljEXlJp+tOIEYvmNYnkvfaRpdeVRpF5yd+A24ZswrVRU9W/W7cXCMw2uq/vQ== -"@pixi/interaction@6.3.0": +"@pixi/interaction@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/interaction/-/interaction-6.3.0.tgz#2329eae55884bf380a4c5443b29631a1fba6f283" integrity sha512-ZAgYJPnpQS07r69o6Mgn4SxurY+t05EWblC8bpVssQ/k2yU3xeWAKNV/Hk39AKrM5S+PBU9YyGX//jM+3gt8rQ== -"@pixi/loaders@6.3.0": +"@pixi/loaders@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/loaders/-/loaders-6.3.0.tgz#82441d1f664c489a754db7d2deb68bccdf97f4d6" integrity sha512-FXW3DkcAg2w0FABS6ixmzJNQSdabHXWumltelYM76NmBSE8oaLmg6tniBvjrTlSxUs3HlgwdeqgnUHV9GIFxLQ== -"@pixi/math@6.3.0": +"@pixi/math-extras@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@pixi/math-extras/-/math-extras-6.3.0.tgz#ff528e873d7e43648a3e669419577ced36e35b3f" + integrity sha512-T3/GWAEVnxZEpFTxxY08zJ02BLcoiso9Goo/oxtp1TC0LT6mzPlMfBputWUUQFfb1BMktfAJuviAk8YZK3lnHg== + +"@pixi/math@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/math/-/math-6.3.0.tgz#2df6a27a8a73e1976ebbe90b01dfeab999b17bdb" integrity sha512-QkF9wl3/kXvthwWhrDAVgWQWl3T9dbyicHsoWfx0s9b3E0rx+PZcpz5ftaAVxGd7EvecIxV9nEUnna9TIjvwJQ== -"@pixi/mesh-extras@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/mesh-extras/-/mesh-extras-6.3.0.tgz#32a8720b3529b98cfe09035ceb3e6c39dc6c78a5" - integrity sha512-rGvpW/UDNPDSALocT2w3jvBpF9TUgyvZMGcxqolIxDbrmRiyUeT1EeYnCQpIqQUnkKW1QKxLpuSjut2yfERe7A== - -"@pixi/mesh@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/mesh/-/mesh-6.3.0.tgz#ce228e8a2c196579d6cf02c650c0b2ff26c43db7" - integrity sha512-ljm1lk8ZyxQaZHl53psPptD7eO8yVt7mbEwly+qSyh61Nj950fq5CBgr2cd7TakBSUfiUthYAYP8wmdwop328Q== - -"@pixi/mixin-cache-as-bitmap@6.3.0": +"@pixi/mixin-cache-as-bitmap@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/mixin-cache-as-bitmap/-/mixin-cache-as-bitmap-6.3.0.tgz#02d8422d2345f941c68bfe33f186537cce521c62" integrity sha512-KIbclUCTv6J2ERIX8LM0PaGezKqfmDbR8X/68irbwsYU3fRtsFb9X4IHttguiItYK8C6syyepEyIRbWB/poc6Q== -"@pixi/mixin-get-child-by-name@6.3.0": +"@pixi/mixin-get-child-by-name@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/mixin-get-child-by-name/-/mixin-get-child-by-name-6.3.0.tgz#5e58d496d2ecd79b98b566901eec74b3b3119c69" integrity sha512-R1nh985Fffo0HG3gmbbsBgbR0obGdjkVb31V9gUFileydY8u1jVA4sL1uzOfBbHAjDE+HFOO1wC1p6ygalUrkQ== -"@pixi/mixin-get-global-position@6.3.0": +"@pixi/mixin-get-global-position@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/mixin-get-global-position/-/mixin-get-global-position-6.3.0.tgz#ba02920c45ea3284b5c58371d9e5e32c61312c05" integrity sha512-hDzLubpLSRH6hp+mn8mpONZeMcMc75ndkz6WROXI0gfoUkFdzxHStGBSk4VJRgtSj1zzOgmEqo7LP/y2blgYlw== -"@pixi/particle-container@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/particle-container/-/particle-container-6.3.0.tgz#991c271e927e31414ff1a362b6148c368db6e3c8" - integrity sha512-yjcMUHIPUL4T27ECBrxgn6j00CpomYLBvdxXWDDqMSnm2W6AA+cy7QM30dCm2mcbStzB4j+cbYvN1+nRIuIE8Q== - -"@pixi/polyfill@6.3.0": +"@pixi/polyfill@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/polyfill/-/polyfill-6.3.0.tgz#4b8862c4c6ce589a21abfafa174acbfcee631d2c" integrity sha512-sjOLw0yndRipWOW3ykkCej5+VMZRBmnd32kUXXum9kgceSeL0w+iRPZrfvaFmgypqGnGpqwg24MsZ3vtIffd9g== @@ -1634,54 +1647,39 @@ object-assign "^4.1.1" promise-polyfill "^8.2.0" -"@pixi/prepare@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/prepare/-/prepare-6.3.0.tgz#8f46e4a67e5189739a3cba70053dca4861ef0f8d" - integrity sha512-eqQpEIAhctZ85YEQWYMI/LmNyLn8K+lpfH783YQQ1WjFmBrFgJzvm1vs+ztIRl+6EIzVIC28RmcBU15Vkmylew== - -"@pixi/runner@6.3.0": +"@pixi/runner@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/runner/-/runner-6.3.0.tgz#e300c0865825fa736376801b57485d3d1d6f5fb8" integrity sha512-dG0YK/59dMay1pBD3sXYWtyDQ1gjRY8QCI38b+wQiH9oFMNFtj/f/RxkL1XyaK0r7sC8TjXUiQ+7+lZlmcqIjw== -"@pixi/settings@6.3.0": +"@pixi/settings@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/settings/-/settings-6.3.0.tgz#1207fdb65fa1cf305e34a97fdffb47004bb8e5f5" integrity sha512-UkbZmlexr6NGM6Qz30Et63bpWAmpmkknOOnavrhWPnnbhFIx4kVzU9mvGMHGSGNLJabX9+gFUdjDGSlzF42v4w== dependencies: ismobilejs "^1.1.0" -"@pixi/sprite-animated@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/sprite-animated/-/sprite-animated-6.3.0.tgz#d28947796dd666e8cd5ed8937b378acaab5615ca" - integrity sha512-P4VroljvyiAc9acwbUVZTHKwM418x5AFOAEYAx9NkF9izh2HhinjLa+iRK70gPnEBOMPwqn1taVnz/n4/aYHWw== - -"@pixi/sprite-tiling@6.3.0": +"@pixi/sprite-tiling@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/sprite-tiling/-/sprite-tiling-6.3.0.tgz#75d0db26c471eaa6ca5c378c787de570486371d1" integrity sha512-4+HodD9QwhiqIptBpT3rXuJDAJ5TSg2IRnHOo/+qSopA70VC1E+RRgyVvxfRfopfptcAHi60XWfzvFLHSV3LsA== -"@pixi/sprite@6.3.0": +"@pixi/sprite@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/sprite/-/sprite-6.3.0.tgz#8441400c001403250cd5bb21d456735373172532" integrity sha512-dv0CSkxjWZeUujYQ6NorJ5Cue6SL+RE/H739JK4+cAwEtoWpYqKqiw6aeUu4aqSRsqjhyk9ilhR+K1MbnImJKA== -"@pixi/spritesheet@6.3.0": +"@pixi/spritesheet@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/spritesheet/-/spritesheet-6.3.0.tgz#d3047938f6ab3d93f69ff535f71fbc39ee86bd3e" integrity sha512-TAIIVA2KFJk7lKB4Ggep99bxpkSjnYlODuLEZ9EoJ6QIEx9A1HesaKwwqzfneeCzX5BOBeJMgZ++rujE29rrpg== -"@pixi/text-bitmap@6.3.0": - version "6.3.0" - resolved "https://registry.yarnpkg.com/@pixi/text-bitmap/-/text-bitmap-6.3.0.tgz#43fe3585a551c9c08b885f2a74626f0def45ecf3" - integrity sha512-ogoJ+k7MHUEUb8b+yBZOi9jLW/TvIEduf2FJ5S52sovjhjs1/uZw2sdR43tM9BGxP1W9H6GE5yOK5f2sEFZIKg== - -"@pixi/text@6.3.0": +"@pixi/text@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/text/-/text-6.3.0.tgz#f39b3aa2567de42f3d4266c276f5abb0529dbb23" integrity sha512-hDevLv8HztzdImA6sIvmpBpNoIyDCrMNJAdjTUo/Kw1aoKlDaOGx4K3J7wVTzV1d1WrreIXtOsO3rQUOzf/hmg== -"@pixi/ticker@6.3.0": +"@pixi/ticker@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/ticker/-/ticker-6.3.0.tgz#0438efd9abbd74eab59be7361bac47553c25e4cb" integrity sha512-cEqyQgM5entsi+h85fUnESBzNc/yMRG/mqsfAr7/KraP7bmCcn3MYVuTycRMkRbuNPjC1NIpqkqiOaxzgAUGPw== @@ -1691,7 +1689,7 @@ resolved "https://registry.yarnpkg.com/@pixi/tilemap/-/tilemap-3.2.2.tgz#8327e5d7007a90be640a0b1eb9943a1e405b57e4" integrity sha512-svdmMyJP63vdae3t66tCmE8IWeO/6lD1xXU+5gzfxqxJS5seTp2bm8mQok2c8PF0O6l/NYlLz6BRklOuEuHboQ== -"@pixi/utils@6.3.0": +"@pixi/utils@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@pixi/utils/-/utils-6.3.0.tgz#74703e1593b3f7462165adcfaf41c62ce303829c" integrity sha512-QI5wb/fDdH8DAzIMlrYS0MhG382FPMLh4s3yRtOaftiOb84LL7Syz//SC+CJAyVB0UV/Lpr+T6PiCa4eBjRDgA== @@ -5908,6 +5906,13 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +gifuct-js@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/gifuct-js/-/gifuct-js-2.1.2.tgz#06152437ba30ec914db8398bd838bd0fbc8a6ecd" + integrity sha512-rI2asw77u0mGgwhV3qA+OEgYqaDn5UNqgs+Bx0FGwSpuqfYn+Ir6RQY5ENNQ8SbIiG/m5gVa7CD5RriO4f4Lsg== + dependencies: + js-binary-schema-parser "^2.0.3" + glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -7440,6 +7445,11 @@ js-base64@^2.1.8: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== +js-binary-schema-parser@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz#3d7848748e8586e63b34e8911b643f59cfb6396e" + integrity sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg== + "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -8951,47 +8961,6 @@ pirates@^4.0.1: resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== -pixi.js@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/pixi.js/-/pixi.js-6.3.0.tgz#466f28a06d6263337c0f91275faf229a02f6a65b" - integrity sha512-ayOmVagMSa5lPVvznDf2e4EppwzPEDnB/q3AYdjTM9Ksw+JKT3lbLuZFo/6U0HNYF9DsJRJL/4ebReZh1hnqLQ== - dependencies: - "@pixi/accessibility" "6.3.0" - "@pixi/app" "6.3.0" - "@pixi/compressed-textures" "6.3.0" - "@pixi/constants" "6.3.0" - "@pixi/core" "6.3.0" - "@pixi/display" "6.3.0" - "@pixi/extract" "6.3.0" - "@pixi/filter-alpha" "6.3.0" - "@pixi/filter-blur" "6.3.0" - "@pixi/filter-color-matrix" "6.3.0" - "@pixi/filter-displacement" "6.3.0" - "@pixi/filter-fxaa" "6.3.0" - "@pixi/filter-noise" "6.3.0" - "@pixi/graphics" "6.3.0" - "@pixi/interaction" "6.3.0" - "@pixi/loaders" "6.3.0" - "@pixi/math" "6.3.0" - "@pixi/mesh" "6.3.0" - "@pixi/mesh-extras" "6.3.0" - "@pixi/mixin-cache-as-bitmap" "6.3.0" - "@pixi/mixin-get-child-by-name" "6.3.0" - "@pixi/mixin-get-global-position" "6.3.0" - "@pixi/particle-container" "6.3.0" - "@pixi/polyfill" "6.3.0" - "@pixi/prepare" "6.3.0" - "@pixi/runner" "6.3.0" - "@pixi/settings" "6.3.0" - "@pixi/sprite" "6.3.0" - "@pixi/sprite-animated" "6.3.0" - "@pixi/sprite-tiling" "6.3.0" - "@pixi/spritesheet" "6.3.0" - "@pixi/text" "6.3.0" - "@pixi/text-bitmap" "6.3.0" - "@pixi/ticker" "6.3.0" - "@pixi/utils" "6.3.0" - pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" From 6ac361443b4926f5e0f3a5a5916af92697a2a72e Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 11 Apr 2022 03:18:07 -0400 Subject: [PATCH 2/4] Fix floor editor --- .../handlers/RoomWidgetChatInputHandler.ts | 11 +-- .../FloorplanEditorContext.tsx | 5 +- .../floorplan-editor/FloorplanEditorView.tsx | 87 ++++++++++--------- .../views/FloorplanCanvasView.tsx | 14 +-- .../navigator/views/NavigatorRoomInfoView.tsx | 4 +- .../floorplan-editor/FloorplanEditorEvent.ts | 8 -- src/events/floorplan-editor/index.ts | 1 - src/events/index.ts | 1 - 8 files changed, 56 insertions(+), 75 deletions(-) delete mode 100644 src/events/floorplan-editor/FloorplanEditorEvent.ts delete mode 100644 src/events/floorplan-editor/index.ts diff --git a/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts b/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts index a02fc4a0..997eb4b4 100644 --- a/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts +++ b/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts @@ -1,8 +1,7 @@ import { AvatarExpressionEnum, HabboClubLevelEnum, NitroEvent, RoomControllerLevel, RoomRotatingEffect, RoomSessionChatEvent, RoomSettingsComposer, RoomShakingEffect, RoomWidgetEnum, RoomZoomEvent, TextureUtils } from '@nitrots/nitro-renderer'; import { GetClubMemberLevel, GetConfiguration, GetNitroInstance, SendMessageComposer } from '../../..'; import { GetRoomEngine, GetSessionDataManager, LocalizeText, NotificationUtilities } from '../../../..'; -import { FloorplanEditorEvent } from '../../../../../events/floorplan-editor/FloorplanEditorEvent'; -import { DispatchUiEvent } from '../../../../../hooks'; +import { CreateLinkEvent } from '../../../CreateLinkEvent'; import { RoomWidgetFloodControlEvent, RoomWidgetUpdateEvent } from '../events'; import { RoomWidgetChatMessage, RoomWidgetChatSelectAvatarMessage, RoomWidgetChatTypingMessage, RoomWidgetMessage, RoomWidgetRequestWidgetMessage } from '../messages'; import { RoomWidgetHandler } from './RoomWidgetHandler'; @@ -158,12 +157,8 @@ export class RoomWidgetChatInputHandler extends RoomWidgetHandler return null; case ':floor': case ':bcfloor': - if(this.container.roomSession.controllerLevel >= RoomControllerLevel.ROOM_OWNER) - { - //this.container.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.FLOOR_EDITOR)); - DispatchUiEvent(new FloorplanEditorEvent(FloorplanEditorEvent.SHOW_FLOORPLAN_EDITOR)); - } - + if(this.container.roomSession.controllerLevel >= RoomControllerLevel.ROOM_OWNER) CreateLinkEvent('floor-editor/show'); + return null; case ':togglefps': { if(GetNitroInstance().ticker.maxFPS > 0) GetNitroInstance().ticker.maxFPS = 0; diff --git a/src/components/floorplan-editor/FloorplanEditorContext.tsx b/src/components/floorplan-editor/FloorplanEditorContext.tsx index bd0c1ddf..6c582ed8 100644 --- a/src/components/floorplan-editor/FloorplanEditorContext.tsx +++ b/src/components/floorplan-editor/FloorplanEditorContext.tsx @@ -17,9 +17,6 @@ const FloorplanEditorContext = createContext({ setVisualizationSettings: null }); -export const FloorplanEditorContextProvider: FC> = props => -{ - return { props.children } -} +export const FloorplanEditorContextProvider: FC> = props => ; export const useFloorplanEditorContext = () => useContext(FloorplanEditorContext); diff --git a/src/components/floorplan-editor/FloorplanEditorView.tsx b/src/components/floorplan-editor/FloorplanEditorView.tsx index 34f82aa5..76ad8b53 100644 --- a/src/components/floorplan-editor/FloorplanEditorView.tsx +++ b/src/components/floorplan-editor/FloorplanEditorView.tsx @@ -1,9 +1,8 @@ -import { FloorHeightMapEvent, NitroPoint, RoomEngineEvent, RoomVisualizationSettingsEvent, UpdateFloorPropertiesMessageComposer } from '@nitrots/nitro-renderer'; +import { FloorHeightMapEvent, ILinkEventTracker, NitroPoint, RoomEngineEvent, RoomVisualizationSettingsEvent, UpdateFloorPropertiesMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; -import { LocalizeText, SendMessageComposer } from '../../api'; +import { AddEventLinkTracker, LocalizeText, RemoveLinkEventTracker, SendMessageComposer } from '../../api'; import { Button, ButtonGroup, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../common'; -import { FloorplanEditorEvent } from '../../events'; -import { UseMessageEventHook, UseRoomEngineEvent, UseUiEvent } from '../../hooks'; +import { UseMessageEventHook, UseRoomEngineEvent } from '../../hooks'; import { FloorplanEditor } from './common/FloorplanEditor'; import { IFloorplanSettings } from './common/IFloorplanSettings'; import { IVisualizationSettings } from './common/IVisualizationSettings'; @@ -33,25 +32,27 @@ export const FloorplanEditorView: FC<{}> = props => thicknessFloor: 1 }); - const onFloorplanEditorEvent = useCallback((event: FloorplanEditorEvent) => + const saveFloorChanges = () => { - switch(event.type) - { - case FloorplanEditorEvent.HIDE_FLOORPLAN_EDITOR: - setIsVisible(false); - break; - case FloorplanEditorEvent.SHOW_FLOORPLAN_EDITOR: - setIsVisible(true); - break; - case FloorplanEditorEvent.TOGGLE_FLOORPLAN_EDITOR: - setIsVisible(prevValue => !prevValue); - break; - } - }, []); + SendMessageComposer(new UpdateFloorPropertiesMessageComposer( + FloorplanEditor.instance.getCurrentTilemapString(), + FloorplanEditor.instance.doorLocation.x, + FloorplanEditor.instance.doorLocation.y, + visualizationSettings.entryPointDir, + convertNumbersForSaving(visualizationSettings.thicknessWall), + convertNumbersForSaving(visualizationSettings.thicknessFloor), + (visualizationSettings.wallHeight - 1) + )); + } - UseUiEvent(FloorplanEditorEvent.HIDE_FLOORPLAN_EDITOR, onFloorplanEditorEvent); - UseUiEvent(FloorplanEditorEvent.SHOW_FLOORPLAN_EDITOR, onFloorplanEditorEvent); - UseUiEvent(FloorplanEditorEvent.TOGGLE_FLOORPLAN_EDITOR, onFloorplanEditorEvent); + const revertChanges = () => + { + setVisualizationSettings({ wallHeight: originalFloorplanSettings.wallHeight, thicknessWall: originalFloorplanSettings.thicknessWall, thicknessFloor: originalFloorplanSettings.thicknessFloor, entryPointDir: originalFloorplanSettings.entryPointDir }); + + FloorplanEditor.instance.doorLocation = new NitroPoint(originalFloorplanSettings.entryPoint[0], originalFloorplanSettings.entryPoint[1]); + FloorplanEditor.instance.setTilemap(originalFloorplanSettings.tilemap, originalFloorplanSettings.reservedTiles); + FloorplanEditor.instance.renderTiles(); + } const onRoomEngineEvent = useCallback((event: RoomEngineEvent) => { @@ -113,27 +114,35 @@ export const FloorplanEditorView: FC<{}> = props => UseMessageEventHook(RoomVisualizationSettingsEvent, onRoomVisualizationSettingsEvent); - const saveFloorChanges = () => + useEffect(() => { - SendMessageComposer(new UpdateFloorPropertiesMessageComposer( - FloorplanEditor.instance.getCurrentTilemapString(), - FloorplanEditor.instance.doorLocation.x, - FloorplanEditor.instance.doorLocation.y, - visualizationSettings.entryPointDir, - convertNumbersForSaving(visualizationSettings.thicknessWall), - convertNumbersForSaving(visualizationSettings.thicknessFloor), - (visualizationSettings.wallHeight - 1) - )); - } + const linkTracker: ILinkEventTracker = { + linkReceived: (url: string) => + { + const parts = url.split('/'); - const revertChanges = () => - { - setVisualizationSettings({ wallHeight: originalFloorplanSettings.wallHeight, thicknessWall: originalFloorplanSettings.thicknessWall, thicknessFloor: originalFloorplanSettings.thicknessFloor, entryPointDir: originalFloorplanSettings.entryPointDir }); + if(parts.length < 2) return; - FloorplanEditor.instance.doorLocation = new NitroPoint(originalFloorplanSettings.entryPoint[0], originalFloorplanSettings.entryPoint[1]); - FloorplanEditor.instance.setTilemap(originalFloorplanSettings.tilemap, originalFloorplanSettings.reservedTiles); - FloorplanEditor.instance.renderTiles(); - } + switch(parts[1]) + { + case 'show': + setIsVisible(true); + return; + case 'hide': + setIsVisible(false); + return; + case 'toggle': + setIsVisible(prevValue => !prevValue); + return; + } + }, + eventUrlPrefix: 'floor-editor/' + }; + + AddEventLinkTracker(linkTracker); + + return () => RemoveLinkEventTracker(linkTracker); + }, []); useEffect(() => { diff --git a/src/components/floorplan-editor/views/FloorplanCanvasView.tsx b/src/components/floorplan-editor/views/FloorplanCanvasView.tsx index da93fc68..9ff612ab 100644 --- a/src/components/floorplan-editor/views/FloorplanCanvasView.tsx +++ b/src/components/floorplan-editor/views/FloorplanCanvasView.tsx @@ -5,15 +5,9 @@ import { SendMessageComposer } from '../../../api'; import { Base, Button, Column, ColumnProps, Flex, Grid } from '../../../common'; import { UseMessageEventHook } from '../../../hooks'; import { FloorplanEditor } from '../common/FloorplanEditor'; -import { IFloorplanSettings } from '../common/IFloorplanSettings'; import { useFloorplanEditorContext } from '../FloorplanEditorContext'; -interface FloorplanCanvasViewProps extends ColumnProps -{ - -} - -export const FloorplanCanvasView: FC = props => +export const FloorplanCanvasView: FC = props => { const { gap = 1, children = null, ...rest } = props; const [ occupiedTilesReceived , setOccupiedTilesReceived ] = useState(false); @@ -25,20 +19,16 @@ export const FloorplanCanvasView: FC = props => { const parser = event.getParser(); - let newFloorPlanSettings: IFloorplanSettings = null; - setOriginalFloorplanSettings(prevValue => { const newValue = { ...prevValue }; newValue.reservedTiles = parser.blockedTilesMap; - newFloorPlanSettings = newValue; + FloorplanEditor.instance.setTilemap(newValue.tilemap, newValue.reservedTiles); return newValue; }); - - FloorplanEditor.instance.setTilemap(newFloorPlanSettings.tilemap, parser.blockedTilesMap); setOccupiedTilesReceived(true); diff --git a/src/components/navigator/views/NavigatorRoomInfoView.tsx b/src/components/navigator/views/NavigatorRoomInfoView.tsx index b1222ee3..46feca66 100644 --- a/src/components/navigator/views/NavigatorRoomInfoView.tsx +++ b/src/components/navigator/views/NavigatorRoomInfoView.tsx @@ -4,7 +4,7 @@ import classNames from 'classnames'; import { FC, useEffect, useState } from 'react'; import { CreateLinkEvent, GetGroupInformation, GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../api'; import { Button, Column, Flex, LayoutBadgeImageView, LayoutRoomThumbnailView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text, UserProfileIconView } from '../../../common'; -import { FloorplanEditorEvent, RoomWidgetThumbnailEvent } from '../../../events'; +import { RoomWidgetThumbnailEvent } from '../../../events'; import { DispatchUiEvent } from '../../../hooks'; import { useNavigatorContext } from '../NavigatorContext'; @@ -72,7 +72,7 @@ export const NavigatorRoomInfoView: FC = props => SendMessageComposer(new RoomMuteComposer()); return; case 'open_floorplan_editor': - DispatchUiEvent(new FloorplanEditorEvent(FloorplanEditorEvent.TOGGLE_FLOORPLAN_EDITOR)); + CreateLinkEvent('floor-editor/toggle'); return; case 'close': onCloseClick(); diff --git a/src/events/floorplan-editor/FloorplanEditorEvent.ts b/src/events/floorplan-editor/FloorplanEditorEvent.ts deleted file mode 100644 index 62f7f3bf..00000000 --- a/src/events/floorplan-editor/FloorplanEditorEvent.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NitroEvent } from '@nitrots/nitro-renderer'; - -export class FloorplanEditorEvent extends NitroEvent -{ - public static SHOW_FLOORPLAN_EDITOR: string = 'FPEE_SHOW_FLOORPLAN_EDITOR'; - public static HIDE_FLOORPLAN_EDITOR: string = 'FPEE_HIDE_FLOORPLAN_EDITOR'; - public static TOGGLE_FLOORPLAN_EDITOR: string = 'FPEE_TOGGLE_FLOORPLAN_EDITOR'; -} diff --git a/src/events/floorplan-editor/index.ts b/src/events/floorplan-editor/index.ts deleted file mode 100644 index f429f780..00000000 --- a/src/events/floorplan-editor/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './FloorplanEditorEvent'; diff --git a/src/events/index.ts b/src/events/index.ts index 4cf8a7f8..288b2364 100644 --- a/src/events/index.ts +++ b/src/events/index.ts @@ -1,5 +1,4 @@ export * from './catalog'; -export * from './floorplan-editor'; export * from './guide-tool'; export * from './help'; export * from './mod-tools'; From 9334bcf1fe03afada8c07c2e88a175ae4f342a9e Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 11 Apr 2022 12:21:39 -0400 Subject: [PATCH 3/4] Bump renderer version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 882552c8..a63f0509 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@nitrots/nitro-renderer": "^1.2.0", + "@nitrots/nitro-renderer": "^1.2.1", "animate.css": "^4.1.1", "classnames": "^2.3.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 57768e2e..e17077ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1450,10 +1450,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@nitrots/nitro-renderer@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.2.0.tgz#b2cb6a766159b49d2791323d0aabde1f6dc44ecf" - integrity sha512-R8g/NDwv4RtZEgJGDKck0l42ey5OZCPDRgVoOg0ETPChS2jiahOwc7/x4EebEql80gXKjPVwuyuqgrsFEIi1jA== +"@nitrots/nitro-renderer@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.2.1.tgz#bd2825a9e931b374c09aba0e50f73ba282a925c2" + integrity sha512-c61M2mC/WTlrzFcLVSYinjXicWJL7UsuhbkZQrftQ8oNdKz1SZDLpI40vHyohV1fSNCPS5NrVTwDK1C7LU1igw== dependencies: "@pixi/app" "^6.3.0" "@pixi/basis" "^6.3.0" From 69c6e78ba7ff4f9330b2586354df80dc10f6a10d Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 11 Apr 2022 12:40:30 -0400 Subject: [PATCH 4/4] Bump renderer --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a63f0509..a15b4ec8 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@fortawesome/fontawesome-svg-core": "^6.1.0", "@fortawesome/free-solid-svg-icons": "^6.1.0", "@fortawesome/react-fontawesome": "^0.1.17", - "@nitrots/nitro-renderer": "^1.2.1", + "@nitrots/nitro-renderer": "^1.2.2", "animate.css": "^4.1.1", "classnames": "^2.3.1", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index e17077ec..b6ee0612 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1450,10 +1450,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@nitrots/nitro-renderer@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.2.1.tgz#bd2825a9e931b374c09aba0e50f73ba282a925c2" - integrity sha512-c61M2mC/WTlrzFcLVSYinjXicWJL7UsuhbkZQrftQ8oNdKz1SZDLpI40vHyohV1fSNCPS5NrVTwDK1C7LU1igw== +"@nitrots/nitro-renderer@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@nitrots/nitro-renderer/-/nitro-renderer-1.2.2.tgz#9dabba24dc701162cc1f1980aa54d20d72532ef2" + integrity sha512-fIBcBhUp1bQexbh2L77bcmkWDQZ/LwTsy+S7KwNxbIRS5B+WVRqDqsZeTaCcaoB2H+GBYakhah5akVMKeos9Wg== dependencies: "@pixi/app" "^6.3.0" "@pixi/basis" "^6.3.0"