diff --git a/bundles/pixi.js-node/package.json b/bundles/pixi.js-node/package.json index 551b054dc7..cb290039a3 100644 --- a/bundles/pixi.js-node/package.json +++ b/bundles/pixi.js-node/package.json @@ -35,7 +35,6 @@ "dependencies": { "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/extensions": "6.5.2", @@ -47,7 +46,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -55,16 +53,12 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2", "@types/gl": "^4.1.0", "@types/xml2js": "^0.4.11", "canvas": "^2.9.1", diff --git a/bundles/pixi.js-node/src/index.ts b/bundles/pixi.js-node/src/index.ts index eb82003071..d6ec60c0d5 100644 --- a/bundles/pixi.js-node/src/index.ts +++ b/bundles/pixi.js-node/src/index.ts @@ -10,7 +10,6 @@ import { NoiseFilter } from '@pixi/filter-noise'; import '@pixi/mixin-cache-as-bitmap'; import '@pixi/mixin-get-child-by-name'; import '@pixi/mixin-get-global-position'; -import * as utils from '@pixi/utils'; // eslint-disable-next-line @typescript-eslint/no-duplicate-imports import { NodeCanvasResource } from './adapter'; import { loadTextures, loadWebFont } from '@pixi/assets'; @@ -43,24 +42,18 @@ export const filters = { export * from '@pixi/app'; export * from './adapter'; export * from '@pixi/assets'; -export * from '@pixi/constants'; export * from '@pixi/core'; export * from '@pixi/display'; export * from '@pixi/extract'; export * from '@pixi/graphics'; -export * from '@pixi/math'; export * from '@pixi/mesh'; export * from '@pixi/mesh-extras'; export * from '@pixi/particle-container'; export * from '@pixi/prepare'; -export * from '@pixi/runner'; -export * from '@pixi/settings'; export * from '@pixi/sprite'; export * from '@pixi/sprite-animated'; export * from '@pixi/sprite-tiling'; export * from '@pixi/spritesheet'; export * from '@pixi/text'; export * from '@pixi/text-bitmap'; -export * from '@pixi/ticker'; -export { utils }; diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index ed1091042a..a5bb10ed55 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -53,7 +53,6 @@ "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", "@pixi/compressed-textures": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/extensions": "6.5.2", @@ -66,7 +65,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -74,15 +72,11 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", - "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text-bitmap": "6.5.2" } } diff --git a/bundles/pixi.js/src/index.ts b/bundles/pixi.js/src/index.ts index 6f485d7198..27dd3060b8 100644 --- a/bundles/pixi.js/src/index.ts +++ b/bundles/pixi.js/src/index.ts @@ -1,4 +1,3 @@ -import * as utils from '@pixi/utils'; import { AlphaFilter } from '@pixi/filter-alpha'; import { BlurFilter, BlurFilterPass } from '@pixi/filter-blur'; import { ColorMatrixFilter } from '@pixi/filter-color-matrix'; @@ -49,25 +48,19 @@ export const filters = { export * from '@pixi/accessibility'; export * from '@pixi/app'; export * from '@pixi/assets'; -export * from '@pixi/constants'; export * from '@pixi/compressed-textures'; export * from '@pixi/core'; export * from '@pixi/display'; export * from '@pixi/events'; export * from '@pixi/extract'; export * from '@pixi/graphics'; -export * from '@pixi/math'; export * from '@pixi/mesh'; export * from '@pixi/mesh-extras'; export * from '@pixi/particle-container'; export * from '@pixi/prepare'; -export * from '@pixi/runner'; export * from '@pixi/sprite'; export * from '@pixi/spritesheet'; export * from '@pixi/sprite-animated'; export * from '@pixi/sprite-tiling'; export * from '@pixi/text'; export * from '@pixi/text-bitmap'; -export * from '@pixi/ticker'; -export * from '@pixi/settings'; -export { utils }; diff --git a/package-lock.json b/package-lock.json index 3963faee16..8b04994547 100644 --- a/package-lock.json +++ b/package-lock.json @@ -64,7 +64,6 @@ "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", "@pixi/compressed-textures": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/events": "6.5.2", @@ -77,7 +76,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -85,16 +83,12 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", - "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text-bitmap": "6.5.2" }, "funding": { "type": "opencollective", @@ -129,7 +123,6 @@ "dependencies": { "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/extensions": "6.5.2", @@ -141,7 +134,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -149,16 +141,12 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2", "@types/gl": "^4.1.0", "@types/xml2js": "^0.4.11", "canvas": "^2.9.1", @@ -25502,8 +25490,7 @@ "peerDependencies": { "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/events": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/events": "6.5.2" } }, "packages/app": { @@ -25520,10 +25507,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/basis": { @@ -25533,9 +25517,7 @@ "peerDependencies": { "@pixi/assets": "6.5.2", "@pixi/compressed-textures": "6.5.2", - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/canvas-display": { @@ -25553,9 +25535,7 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } }, "packages/canvas-graphics": { @@ -25565,10 +25545,8 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/graphics": "6.5.2" } }, "packages/canvas-mesh": { @@ -25578,11 +25556,9 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/mesh": "6.5.2", - "@pixi/mesh-extras": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/mesh-extras": "6.5.2" } }, "packages/canvas-particle-container": { @@ -25600,8 +25576,7 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/prepare": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/prepare": "6.5.2" } }, "packages/canvas-renderer": { @@ -25609,11 +25584,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/canvas-sprite": { @@ -25623,11 +25594,8 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/canvas-sprite-tiling": { @@ -25637,9 +25605,8 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/canvas-sprite": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite-tiling": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/sprite-tiling": "6.5.2" } }, "packages/canvas-text": { @@ -25658,10 +25625,7 @@ "license": "MIT", "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/constants": { @@ -25674,20 +25638,18 @@ "version": "6.5.2", "license": "MIT", "dependencies": { - "@types/offscreencanvas": "^2019.6.4" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/pixijs" - }, - "peerDependencies": { "@pixi/constants": "6.5.2", "@pixi/extensions": "6.5.2", "@pixi/math": "6.5.2", "@pixi/runner": "6.5.2", "@pixi/settings": "6.5.2", "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/utils": "6.5.2", + "@types/offscreencanvas": "^2019.6.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/pixijs" } }, "packages/display": { @@ -25695,9 +25657,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/events": { @@ -25705,9 +25665,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/display": "6.5.2" } }, "packages/extensions": { @@ -25720,9 +25679,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/filter-alpha": { @@ -25738,8 +25695,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/filter-color-matrix": { @@ -25755,8 +25711,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/filter-fxaa": { @@ -25780,12 +25735,9 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/graphics-extras": { @@ -25793,8 +25745,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/graphics": "6.5.2" } }, "packages/loaders": { @@ -25818,7 +25770,7 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/mesh": { @@ -25826,12 +25778,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } }, "packages/mesh-extras": { @@ -25839,11 +25787,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/mesh": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/mesh": "6.5.2" } }, "packages/mixin-cache-as-bitmap": { @@ -25853,10 +25798,7 @@ "peerDependencies": { "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/mixin-get-child-by-name": { @@ -25872,8 +25814,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/display": "6.5.2" } }, "packages/particle-container": { @@ -25881,12 +25823,9 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/prepare": { @@ -25897,10 +25836,7 @@ "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/text": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text": "6.5.2" } }, "packages/runner": { @@ -25921,12 +25857,8 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } }, "packages/sprite-animated": { @@ -25935,8 +25867,7 @@ "license": "MIT", "peerDependencies": { "@pixi/core": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/ticker": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/sprite-tiling": { @@ -25944,12 +25875,9 @@ "version": "6.5.2", "license": "MIT", "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/spritesheet": { @@ -25958,9 +25886,7 @@ "license": "MIT", "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } }, "packages/text": { @@ -25969,10 +25895,7 @@ "license": "MIT", "peerDependencies": { "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } }, "packages/text-bitmap": { @@ -25981,21 +25904,17 @@ "license": "MIT", "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/text": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text": "6.5.2" } }, "packages/ticker": { "name": "@pixi/ticker", "version": "6.5.2", "license": "MIT", - "peerDependencies": { + "dependencies": { "@pixi/extensions": "6.5.2", "@pixi/settings": "6.5.2" } @@ -26013,6 +25932,8 @@ "version": "6.5.2", "license": "MIT", "dependencies": { + "@pixi/constants": "6.5.2", + "@pixi/settings": "6.5.2", "@types/earcut": "^2.1.0", "earcut": "^2.2.4", "eventemitter3": "^3.1.0", @@ -26020,10 +25941,6 @@ }, "devDependencies": { "css-color-names": "^1.0.1" - }, - "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/settings": "6.5.2" } }, "tools/integration-tests": { @@ -29834,6 +29751,13 @@ "@pixi/core": { "version": "file:packages/core", "requires": { + "@pixi/constants": "6.5.2", + "@pixi/extensions": "6.5.2", + "@pixi/math": "6.5.2", + "@pixi/runner": "6.5.2", + "@pixi/settings": "6.5.2", + "@pixi/ticker": "6.5.2", + "@pixi/utils": "6.5.2", "@types/offscreencanvas": "^2019.6.4" } }, @@ -29907,7 +29831,6 @@ "requires": { "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/extensions": "6.5.2", @@ -29919,7 +29842,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -29927,16 +29849,12 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2", "@types/gl": "^4.1.0", "@types/xml2js": "^0.4.11", "canvas": "^2.9.1", @@ -29979,7 +29897,11 @@ "version": "file:packages/text-bitmap" }, "@pixi/ticker": { - "version": "file:packages/ticker" + "version": "file:packages/ticker", + "requires": { + "@pixi/extensions": "6.5.2", + "@pixi/settings": "6.5.2" + } }, "@pixi/unsafe-eval": { "version": "file:packages/unsafe-eval" @@ -29987,6 +29909,8 @@ "@pixi/utils": { "version": "file:packages/utils", "requires": { + "@pixi/constants": "6.5.2", + "@pixi/settings": "6.5.2", "@types/earcut": "^2.1.0", "css-color-names": "^1.0.1", "earcut": "^2.2.4", @@ -41007,7 +40931,6 @@ "@pixi/app": "6.5.2", "@pixi/assets": "6.5.2", "@pixi/compressed-textures": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/events": "6.5.2", @@ -41020,7 +40943,6 @@ "@pixi/filter-fxaa": "6.5.2", "@pixi/filter-noise": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", "@pixi/mesh-extras": "6.5.2", "@pixi/mixin-cache-as-bitmap": "6.5.2", @@ -41028,16 +40950,12 @@ "@pixi/mixin-get-global-position": "6.5.2", "@pixi/particle-container": "6.5.2", "@pixi/prepare": "6.5.2", - "@pixi/runner": "6.5.2", - "@pixi/settings": "6.5.2", "@pixi/sprite": "6.5.2", "@pixi/sprite-animated": "6.5.2", "@pixi/sprite-tiling": "6.5.2", "@pixi/spritesheet": "6.5.2", "@pixi/text": "6.5.2", - "@pixi/text-bitmap": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text-bitmap": "6.5.2" } }, "pixi.js-legacy": { diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index b214ac4003..bdec5113ea 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -40,7 +40,6 @@ "peerDependencies": { "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/events": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/events": "6.5.2" } } diff --git a/packages/accessibility/src/AccessibilityManager.ts b/packages/accessibility/src/AccessibilityManager.ts index 7a37c18bcb..3a2c226976 100644 --- a/packages/accessibility/src/AccessibilityManager.ts +++ b/packages/accessibility/src/AccessibilityManager.ts @@ -1,12 +1,10 @@ import { DisplayObject } from '@pixi/display'; -import { isMobile, removeItems } from '@pixi/utils'; import { accessibleTarget } from './accessibleTarget'; -import type { Rectangle } from '@pixi/math'; import type { Container } from '@pixi/display'; -import { ExtensionType, extensions } from '@pixi/core'; +import { ExtensionType, extensions, utils } from '@pixi/core'; import type { IAccessibleHTMLElement } from './accessibleTarget'; -import type { IRenderer, ExtensionMetadata } from '@pixi/core'; +import type { Rectangle, IRenderer, ExtensionMetadata } from '@pixi/core'; import { FederatedEvent } from '@pixi/events'; // add some extra variables to the container.. @@ -89,7 +87,7 @@ export class AccessibilityManager { this._hookDiv = null; - if (isMobile.tablet || isMobile.phone) + if (utils.isMobile.tablet || utils.isMobile.phone) { this.createTouchHook(); } @@ -274,7 +272,7 @@ export class AccessibilityManager */ const now = performance.now(); - if (isMobile.android.device && now < this.androidUpdateCount) + if (utils.isMobile.android.device && now < this.androidUpdateCount) { return; } @@ -313,7 +311,7 @@ export class AccessibilityManager { child._accessibleActive = false; - removeItems(this.children, i, 1); + utils.removeItems(this.children, i, 1); this.div.removeChild(child._accessibleDiv); this.pool.push(child._accessibleDiv); child._accessibleDiv = null; diff --git a/packages/app/src/Application.ts b/packages/app/src/Application.ts index 37876dc37c..eac812af7c 100644 --- a/packages/app/src/Application.ts +++ b/packages/app/src/Application.ts @@ -1,8 +1,7 @@ import { Container } from '@pixi/display'; import { autoDetectRenderer, extensions, ExtensionType } from '@pixi/core'; -import type { Rectangle } from '@pixi/math'; -import type { IRendererOptionsAuto, IRenderer } from '@pixi/core'; +import type { Rectangle, IRendererOptionsAuto, IRenderer } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; /** diff --git a/packages/app/test/Application.tests.ts b/packages/app/test/Application.tests.ts index c8d60530d8..2311b10a62 100644 --- a/packages/app/test/Application.tests.ts +++ b/packages/app/test/Application.tests.ts @@ -1,9 +1,8 @@ import { Application } from '@pixi/app'; -import { extensions, ExtensionType } from '@pixi/core'; +import { extensions, ExtensionType, utils } from '@pixi/core'; import { Container } from '@pixi/display'; -import { skipHello } from '@pixi/utils'; -skipHello(); +utils.skipHello(); describe('Application', () => { diff --git a/packages/assets/package.json b/packages/assets/package.json index c945d869b9..c0575b311e 100644 --- a/packages/assets/package.json +++ b/packages/assets/package.json @@ -45,9 +45,6 @@ "url": "https://github.com/pixijs/pixi.js/issues" }, "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/assets/src/detections/parsers/detectAvif.ts b/packages/assets/src/detections/parsers/detectAvif.ts index b0cb489c97..40e5ee1516 100644 --- a/packages/assets/src/detections/parsers/detectAvif.ts +++ b/packages/assets/src/detections/parsers/detectAvif.ts @@ -1,5 +1,4 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { settings, extensions, ExtensionType } from '@pixi/core'; import type { FormatDetectionParser } from '..'; import { addFormats, removeFormats } from '../utils/detectUtils'; diff --git a/packages/assets/src/detections/parsers/detectWebp.ts b/packages/assets/src/detections/parsers/detectWebp.ts index b95c481634..03f15ddcc8 100644 --- a/packages/assets/src/detections/parsers/detectWebp.ts +++ b/packages/assets/src/detections/parsers/detectWebp.ts @@ -1,5 +1,4 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { settings, extensions, ExtensionType } from '@pixi/core'; import type { FormatDetectionParser } from '..'; import { addFormats, removeFormats } from '../utils/detectUtils'; diff --git a/packages/assets/src/loader/Loader.ts b/packages/assets/src/loader/Loader.ts index 320affa6ed..36f56ddbe8 100644 --- a/packages/assets/src/loader/Loader.ts +++ b/packages/assets/src/loader/Loader.ts @@ -1,4 +1,4 @@ -import { path } from '@pixi/utils'; +import { utils } from '@pixi/core'; import { convertToList, isSingleItem } from '../utils'; import type { LoaderParser } from './parsers/LoaderParser'; import type { PromiseAndParser, LoadAsset } from './types'; @@ -121,7 +121,7 @@ export class Loader const promises: Promise[] = assetsToLoad.map(async (asset: LoadAsset) => { - const url = path.toAbsolute(asset.src); + const url = utils.path.toAbsolute(asset.src); if (!assets[asset.src]) { @@ -177,7 +177,7 @@ export class Loader const promises: Promise[] = assetsToUnload.map(async (asset: LoadAsset) => { - const url = path.toAbsolute(asset.src); + const url = utils.path.toAbsolute(asset.src); const loadPromise = this.promiseCache[url]; diff --git a/packages/assets/src/loader/parsers/loadJson.ts b/packages/assets/src/loader/parsers/loadJson.ts index 141ba1334d..378a9451fc 100644 --- a/packages/assets/src/loader/parsers/loadJson.ts +++ b/packages/assets/src/loader/parsers/loadJson.ts @@ -1,9 +1,8 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { path } from '@pixi/utils'; -import type { LoaderParser } from './LoaderParser'; +import { settings, utils, extensions, ExtensionType } from '@pixi/core'; import { LoaderParserPriority } from './LoaderParser'; +import type { LoaderParser } from './LoaderParser'; + /** simple loader plugin for loading json data */ export const loadJson = { extension: { @@ -13,7 +12,7 @@ export const loadJson = { test(url: string): boolean { - return (path.extname(url).includes('.json')); + return (utils.path.extname(url).includes('.json')); }, async load(url: string): Promise diff --git a/packages/assets/src/loader/parsers/loadTxt.ts b/packages/assets/src/loader/parsers/loadTxt.ts index 20b316ca61..9a6fb7e654 100644 --- a/packages/assets/src/loader/parsers/loadTxt.ts +++ b/packages/assets/src/loader/parsers/loadTxt.ts @@ -1,9 +1,8 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { path } from '@pixi/utils'; -import type { LoaderParser } from './LoaderParser'; +import { settings, utils, extensions, ExtensionType } from '@pixi/core'; import { LoaderParserPriority } from './LoaderParser'; +import type { LoaderParser } from './LoaderParser'; + /** Simple loader plugin for loading text data */ export const loadTxt = { extension: { @@ -13,7 +12,7 @@ export const loadTxt = { test(url: string): boolean { - return (path.extname(url).includes('.txt')); + return (utils.path.extname(url).includes('.txt')); }, async load(url: string): Promise diff --git a/packages/assets/src/loader/parsers/loadWebFont.ts b/packages/assets/src/loader/parsers/loadWebFont.ts index 6e1247af06..f23041da40 100644 --- a/packages/assets/src/loader/parsers/loadWebFont.ts +++ b/packages/assets/src/loader/parsers/loadWebFont.ts @@ -1,5 +1,4 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { path } from '@pixi/utils'; +import { extensions, ExtensionType, utils } from '@pixi/core'; import type { LoadAsset } from '../types'; import type { LoaderParser } from './LoaderParser'; import { LoaderParserPriority } from './LoaderParser'; @@ -27,8 +26,8 @@ export type LoadFontData = { */ export function getFontFamilyName(url: string): string { - const ext = path.extname(url); - const name = path.basename(url, ext); + const ext = utils.path.extname(url); + const name = utils.path.basename(url, ext); // Replace dashes by white spaces const nameWithSpaces = name.replace(/(-|_)/g, ' '); diff --git a/packages/assets/src/loader/parsers/textures/loadSVG.ts b/packages/assets/src/loader/parsers/textures/loadSVG.ts index eb5e405d10..ade9caf2ad 100644 --- a/packages/assets/src/loader/parsers/textures/loadSVG.ts +++ b/packages/assets/src/loader/parsers/textures/loadSVG.ts @@ -1,14 +1,12 @@ +import { settings, utils, BaseTexture, ExtensionType, SVGResource } from '@pixi/core'; +import { LoaderParserPriority } from '../LoaderParser'; +import { loadTextures } from './loadTexture'; +import { createTexture } from './utils/createTexture'; + import type { IBaseTextureOptions, Texture } from '@pixi/core'; -import { BaseTexture, ExtensionType, SVGResource } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { getResolutionOfUrl, path } from '@pixi/utils'; import type { Loader } from '../../Loader'; import type { LoadAsset } from '../../types'; - import type { LoaderParser } from '../LoaderParser'; -import { LoaderParserPriority } from '../LoaderParser'; -import { loadTextures } from './loadTexture'; -import { createTexture } from './utils/createTexture'; /** Loads SVG's into Textures */ export const loadSVG = { @@ -19,7 +17,7 @@ export const loadSVG = { test(url: string): boolean { - return (path.extname(url).includes('.svg')); + return (utils.path.extname(url).includes('.svg')); }, async testParse(data: string): Promise @@ -32,7 +30,7 @@ export const loadSVG = { const src = new SVGResource(asset, data?.data?.resourceOptions); const base = new BaseTexture(src, { - resolution: getResolutionOfUrl(asset), + resolution: utils.getResolutionOfUrl(asset), ...data?.data, }); diff --git a/packages/assets/src/loader/parsers/textures/loadTexture.ts b/packages/assets/src/loader/parsers/textures/loadTexture.ts index ac448132fc..3eab2f3633 100644 --- a/packages/assets/src/loader/parsers/textures/loadTexture.ts +++ b/packages/assets/src/loader/parsers/textures/loadTexture.ts @@ -1,16 +1,14 @@ -import type { IBaseTextureOptions, Texture } from '@pixi/core'; -import { BaseTexture, extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { getResolutionOfUrl } from '@pixi/utils'; +import { BaseTexture, extensions, ExtensionType, settings, utils } from '@pixi/core'; import type { Loader } from '../../Loader'; import type { LoadAsset } from '../../types'; - -import type { LoaderParser } from '../LoaderParser'; import { LoaderParserPriority } from '../LoaderParser'; import { WorkerManager } from '../WorkerManager'; import { checkExtension } from './utils/checkExtension'; import { createTexture } from './utils/createTexture'; +import type { IBaseTextureOptions, Texture } from '@pixi/core'; +import type { LoaderParser } from '../LoaderParser'; + const validImages = ['.jpg', '.png', '.jpeg', '.avif', '.webp']; /** @@ -91,7 +89,7 @@ export const loadTextures = { } const base = new BaseTexture(src, { - resolution: getResolutionOfUrl(url), + resolution: utils.getResolutionOfUrl(url), ...asset.data, }); diff --git a/packages/assets/src/loader/parsers/textures/utils/checkExtension.ts b/packages/assets/src/loader/parsers/textures/utils/checkExtension.ts index 5840d3903c..1e5c63f1ee 100644 --- a/packages/assets/src/loader/parsers/textures/utils/checkExtension.ts +++ b/packages/assets/src/loader/parsers/textures/utils/checkExtension.ts @@ -1,9 +1,9 @@ -import { path } from '@pixi/utils'; +import { utils } from '@pixi/core'; export function checkExtension(url: string, extension: string | string[]): boolean { const tempURL = url.split('?')[0]; - const ext = path.extname(tempURL).toLowerCase(); + const ext = utils.path.extname(tempURL).toLowerCase(); if (Array.isArray(extension)) { diff --git a/packages/assets/src/resolver/Resolver.ts b/packages/assets/src/resolver/Resolver.ts index 5cac1f0f13..93b3f68943 100644 --- a/packages/assets/src/resolver/Resolver.ts +++ b/packages/assets/src/resolver/Resolver.ts @@ -1,4 +1,4 @@ -import { path } from '@pixi/utils'; +import { utils } from '@pixi/core'; import { convertToList } from '../utils/convertToList'; import { createStringVariations } from '../utils/createStringVariations'; import { isSingleItem } from '../utils/isSingleItem'; @@ -342,7 +342,7 @@ export class Resolver if (this._basePath || this._rootPath) { - formattedAsset.src = path.toAbsolute(formattedAsset.src, this._basePath, this._rootPath); + formattedAsset.src = utils.path.toAbsolute(formattedAsset.src, this._basePath, this._rootPath); } formattedAsset.data = formattedAsset.data ?? data; @@ -504,7 +504,7 @@ export class Resolver if (this._basePath || this._rootPath) { - src = path.toAbsolute(src, this._basePath, this._rootPath); + src = utils.path.toAbsolute(src, this._basePath, this._rootPath); } // if the resolver fails we just pass back the key assuming its a url diff --git a/packages/assets/src/resolver/parsers/resolveTextureUrl.ts b/packages/assets/src/resolver/parsers/resolveTextureUrl.ts index ec301e65f5..9ad60fd2c2 100644 --- a/packages/assets/src/resolver/parsers/resolveTextureUrl.ts +++ b/packages/assets/src/resolver/parsers/resolveTextureUrl.ts @@ -1,7 +1,6 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; - +import { settings, extensions, ExtensionType } from '@pixi/core'; import { loadTextures } from '../../loader'; + import type { ResolveAsset, ResolveURLParser } from '../types'; export const resolveTextureUrl = { diff --git a/packages/basis/package.json b/packages/basis/package.json index fc527ac719..45ede9693a 100644 --- a/packages/basis/package.json +++ b/packages/basis/package.json @@ -48,8 +48,6 @@ "peerDependencies": { "@pixi/assets": "6.5.2", "@pixi/compressed-textures": "6.5.2", - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/basis/src/Basis.ts b/packages/basis/src/Basis.ts index a85190222b..e1513d29eb 100644 --- a/packages/basis/src/Basis.ts +++ b/packages/basis/src/Basis.ts @@ -1,4 +1,4 @@ -import { TYPES } from '@pixi/constants'; +import { TYPES } from '@pixi/core'; import { INTERNAL_FORMATS } from '@pixi/compressed-textures'; /** diff --git a/packages/basis/src/loader/BasisParser.ts b/packages/basis/src/loader/BasisParser.ts index 43eba2ec29..0cf043f83b 100644 --- a/packages/basis/src/loader/BasisParser.ts +++ b/packages/basis/src/loader/BasisParser.ts @@ -1,7 +1,5 @@ import { CompressedTextureResource } from '@pixi/compressed-textures'; -import { TYPES } from '@pixi/constants'; -import { BufferResource } from '@pixi/core'; -import type { BasisBinding, BasisTextureExtensions } from '../Basis'; +import { BufferResource, TYPES, settings } from '@pixi/core'; import { BASIS_FORMATS, BASIS_FORMATS_ALPHA, @@ -10,8 +8,8 @@ import { } from '../Basis'; import { TranscoderWorker } from '../TranscoderWorker'; +import type { BasisBinding, BasisTextureExtensions } from '../Basis'; import type { CompressedLevelBuffer, INTERNAL_FORMATS } from '@pixi/compressed-textures'; -import { settings } from '@pixi/settings'; export type TranscodedResourcesArray = (Array | Array) & { basisFormat: BASIS_FORMATS diff --git a/packages/basis/src/loader/loadBasis.ts b/packages/basis/src/loader/loadBasis.ts index 04c2775d6a..8f6f04f483 100644 --- a/packages/basis/src/loader/loadBasis.ts +++ b/packages/basis/src/loader/loadBasis.ts @@ -1,18 +1,13 @@ -import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; +import { BaseTexture, extensions, ExtensionType, settings, ALPHA_MODES, FORMATS, MIPMAP_MODES } from '@pixi/core'; import { checkExtension, createTexture, LoaderParserPriority } from '@pixi/assets'; - -import type { IBaseTextureOptions, Texture } from '@pixi/core'; -import { BaseTexture, extensions, ExtensionType } from '@pixi/core'; - import { CompressedTextureResource } from '@pixi/compressed-textures'; -import type { TYPES } from '@pixi/constants'; -import { ALPHA_MODES, FORMATS, MIPMAP_MODES } from '@pixi/constants'; -import { settings } from '@pixi/settings'; - import { BASIS_FORMATS, BASIS_FORMAT_TO_TYPE } from '../Basis'; import { BasisParser } from './BasisParser'; import { TranscoderWorker } from '../TranscoderWorker'; +import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; +import type { IBaseTextureOptions, Texture, TYPES } from '@pixi/core'; + /** Load BASIS textures! */ export const loadBasis = { extension: { diff --git a/packages/canvas-extract/package.json b/packages/canvas-extract/package.json index 1b25dff168..61644574ce 100644 --- a/packages/canvas-extract/package.json +++ b/packages/canvas-extract/package.json @@ -40,8 +40,6 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } } diff --git a/packages/canvas-extract/src/CanvasExtract.ts b/packages/canvas-extract/src/CanvasExtract.ts index 20244b1107..2c39a22e34 100644 --- a/packages/canvas-extract/src/CanvasExtract.ts +++ b/packages/canvas-extract/src/CanvasExtract.ts @@ -1,6 +1,5 @@ -import { extensions, ExtensionType, RenderTexture } from '@pixi/core'; -import { CanvasRenderTarget } from '@pixi/utils'; -import { Rectangle } from '@pixi/math'; +import { Rectangle, extensions, ExtensionType, RenderTexture, utils } from '@pixi/core'; + import type { CanvasRenderer } from '@pixi/canvas-renderer'; import type { DisplayObject } from '@pixi/display'; import type { BaseRenderTexture, ISystem, ExtensionMetadata } from '@pixi/core'; @@ -114,7 +113,7 @@ export class CanvasExtract implements ISystem const width = Math.round(frame.width * resolution); const height = Math.round(frame.height * resolution); - const canvasBuffer = new CanvasRenderTarget(width, height, 1); + const canvasBuffer = new utils.CanvasRenderTarget(width, height, 1); const canvasData = context.getImageData(x, y, width, height); canvasBuffer.context.putImageData(canvasData, 0, 0); diff --git a/packages/canvas-extract/test/CanvasExtract.tests.ts b/packages/canvas-extract/test/CanvasExtract.tests.ts index 0df5fb647e..0fb86daf34 100644 --- a/packages/canvas-extract/test/CanvasExtract.tests.ts +++ b/packages/canvas-extract/test/CanvasExtract.tests.ts @@ -1,12 +1,11 @@ import { CanvasExtract } from '@pixi/canvas-extract'; import { CanvasRenderer } from '@pixi/canvas-renderer'; import { Sprite } from '@pixi/sprite'; -import { skipHello } from '@pixi/utils'; -import { Texture, RenderTexture } from '@pixi/core'; +import { Texture, RenderTexture, utils } from '@pixi/core'; import '@pixi/canvas-display'; -skipHello(); +utils.skipHello(); describe('CanvasExtract', () => { diff --git a/packages/canvas-graphics/package.json b/packages/canvas-graphics/package.json index 75451fc8e5..4eb848b216 100644 --- a/packages/canvas-graphics/package.json +++ b/packages/canvas-graphics/package.json @@ -40,9 +40,7 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/graphics": "6.5.2" } } diff --git a/packages/canvas-graphics/src/CanvasGraphicsRenderer.ts b/packages/canvas-graphics/src/CanvasGraphicsRenderer.ts index 1c946f992e..3b84db4235 100644 --- a/packages/canvas-graphics/src/CanvasGraphicsRenderer.ts +++ b/packages/canvas-graphics/src/CanvasGraphicsRenderer.ts @@ -1,11 +1,10 @@ -import type { ExtensionMetadata } from '@pixi/core'; -import { extensions, ExtensionType, Texture } from '@pixi/core'; -import { SHAPES, Matrix } from '@pixi/math'; +import { SHAPES, Matrix, extensions, ExtensionType, Texture } from '@pixi/core'; import { canvasUtils } from '@pixi/canvas-renderer'; +import { PolygonUtils } from './utils/PolygonUtils'; + import type { CanvasRenderer, CrossPlatformCanvasRenderingContext2D } from '@pixi/canvas-renderer'; import type { FillStyle, Graphics, GraphicsData, LineStyle } from '@pixi/graphics'; -import type { Circle, Ellipse, Polygon, Rectangle, RoundedRectangle } from '@pixi/math'; -import { PolygonUtils } from './utils/PolygonUtils'; +import type { ExtensionMetadata, Circle, Ellipse, Polygon, Rectangle, RoundedRectangle } from '@pixi/core'; /* * @author Mat Groves diff --git a/packages/canvas-graphics/src/Graphics.ts b/packages/canvas-graphics/src/Graphics.ts index bf9406915c..0564e5de25 100644 --- a/packages/canvas-graphics/src/Graphics.ts +++ b/packages/canvas-graphics/src/Graphics.ts @@ -1,10 +1,8 @@ import { Graphics } from '@pixi/graphics'; import { CanvasRenderer } from '@pixi/canvas-renderer'; -import { RenderTexture, Texture } from '@pixi/core'; -import { Matrix } from '@pixi/math'; +import { Matrix, RenderTexture, Texture } from '@pixi/core'; -import type { SCALE_MODES } from '@pixi/constants'; -import type { BaseRenderTexture } from '@pixi/core'; +import type { SCALE_MODES, BaseRenderTexture } from '@pixi/core'; let canvasRenderer: CanvasRenderer; const tempMatrix = new Matrix(); diff --git a/packages/canvas-mesh/package.json b/packages/canvas-mesh/package.json index afd24859bf..5e748b2afd 100644 --- a/packages/canvas-mesh/package.json +++ b/packages/canvas-mesh/package.json @@ -40,10 +40,8 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/mesh": "6.5.2", - "@pixi/mesh-extras": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/mesh-extras": "6.5.2" } } diff --git a/packages/canvas-mesh/src/CanvasMeshRenderer.ts b/packages/canvas-mesh/src/CanvasMeshRenderer.ts index 31d6e3f9b2..ec41653bc3 100644 --- a/packages/canvas-mesh/src/CanvasMeshRenderer.ts +++ b/packages/canvas-mesh/src/CanvasMeshRenderer.ts @@ -1,8 +1,7 @@ -import type { ExtensionMetadata } from '@pixi/core'; -import { extensions, ExtensionType, Texture } from '@pixi/core'; -import { DRAW_MODES } from '@pixi/constants'; +import { DRAW_MODES, extensions, ExtensionType, Texture } from '@pixi/core'; import { canvasUtils } from '@pixi/canvas-renderer'; +import type { ExtensionMetadata } from '@pixi/core'; import type { CanvasRenderer } from '@pixi/canvas-renderer'; import type { Mesh } from '@pixi/mesh'; diff --git a/packages/canvas-mesh/src/settings.ts b/packages/canvas-mesh/src/settings.ts index 114b10d367..5a13801841 100644 --- a/packages/canvas-mesh/src/settings.ts +++ b/packages/canvas-mesh/src/settings.ts @@ -1,4 +1,4 @@ -import { settings } from '@pixi/settings'; +import { settings } from '@pixi/core'; /** * Default `canvasPadding` for canvas-based Mesh rendering. diff --git a/packages/canvas-prepare/package.json b/packages/canvas-prepare/package.json index d709f1c6bf..31174ea8c8 100644 --- a/packages/canvas-prepare/package.json +++ b/packages/canvas-prepare/package.json @@ -40,7 +40,6 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/prepare": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/prepare": "6.5.2" } } diff --git a/packages/canvas-prepare/src/CanvasPrepare.ts b/packages/canvas-prepare/src/CanvasPrepare.ts index 6488ddf7c8..cb53bb4e96 100644 --- a/packages/canvas-prepare/src/CanvasPrepare.ts +++ b/packages/canvas-prepare/src/CanvasPrepare.ts @@ -1,6 +1,5 @@ -import { BaseTexture, extensions, ExtensionType } from '@pixi/core'; +import { settings, BaseTexture, extensions, ExtensionType } from '@pixi/core'; import { BasePrepare } from '@pixi/prepare'; -import { settings } from '@pixi/settings'; import type { ISystem, ExtensionMetadata, IRenderer } from '@pixi/core'; import type { CanvasRenderer } from '@pixi/canvas-renderer'; diff --git a/packages/canvas-renderer/package.json b/packages/canvas-renderer/package.json index 0ea478ae8a..a658e5a3fc 100644 --- a/packages/canvas-renderer/package.json +++ b/packages/canvas-renderer/package.json @@ -38,10 +38,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/canvas-renderer/src/CanvasContextSystem.ts b/packages/canvas-renderer/src/CanvasContextSystem.ts index 1602701505..279ff4638f 100644 --- a/packages/canvas-renderer/src/CanvasContextSystem.ts +++ b/packages/canvas-renderer/src/CanvasContextSystem.ts @@ -1,11 +1,8 @@ -import { Matrix } from '@pixi/math'; +import { BLEND_MODES, SCALE_MODES, settings, Matrix, extensions, ExtensionType } from '@pixi/core'; +import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; import type { CanvasRenderer } from './CanvasRenderer'; import type { ExtensionMetadata, ISystem } from '@pixi/core'; -import { extensions, ExtensionType } from '@pixi/core'; -import { mapCanvasBlendModesToPixi } from './utils/mapCanvasBlendModesToPixi'; -import { BLEND_MODES, SCALE_MODES } from '@pixi/constants'; -import { settings } from '@pixi/settings'; const tempMatrix = new Matrix(); diff --git a/packages/canvas-renderer/src/CanvasMaskSystem.ts b/packages/canvas-renderer/src/CanvasMaskSystem.ts index ea485759a8..46c9b5f77f 100644 --- a/packages/canvas-renderer/src/CanvasMaskSystem.ts +++ b/packages/canvas-renderer/src/CanvasMaskSystem.ts @@ -1,12 +1,9 @@ -import type { Polygon } from '@pixi/math'; -import { SHAPES } from '@pixi/math'; +import { SHAPES, extensions, ExtensionType } from '@pixi/core'; +import type { ExtensionMetadata, ISystem, MaskData, Polygon } from '@pixi/core'; import type { CanvasRenderer } from './CanvasRenderer'; import type { Graphics } from '@pixi/graphics'; -import type { ExtensionMetadata, ISystem, MaskData } from '@pixi/core'; -import { extensions, ExtensionType } from '@pixi/core'; import type { Container } from '@pixi/display'; - /** * A set of functions used to handle masking. * diff --git a/packages/canvas-renderer/src/CanvasObjectRendererSystem.ts b/packages/canvas-renderer/src/CanvasObjectRendererSystem.ts index 3cae1cc5d7..85f98d6d8a 100644 --- a/packages/canvas-renderer/src/CanvasObjectRendererSystem.ts +++ b/packages/canvas-renderer/src/CanvasObjectRendererSystem.ts @@ -1,19 +1,19 @@ -import type { Matrix } from '@pixi/math'; +import { + BLEND_MODES, + utils, + extensions, + CanvasResource, + ExtensionType } from '@pixi/core'; import type { CanvasRenderer } from './CanvasRenderer'; import type { + Matrix, BaseRenderTexture, ExtensionMetadata, IRendererRenderOptions, ISystem, IRenderableObject, RenderTexture } from '@pixi/core'; -import { - extensions, - CanvasResource, - ExtensionType } from '@pixi/core'; -import { BLEND_MODES } from '@pixi/constants'; -import { CanvasRenderTarget, hex2string, rgb2hex } from '@pixi/utils'; import type { CrossPlatformCanvasRenderingContext2D } from './CanvasContextSystem'; /** @@ -82,7 +82,7 @@ export class CanvasObjectRendererSystem implements ISystem if (!renderTexture._canvasRenderTarget) { - renderTexture._canvasRenderTarget = new CanvasRenderTarget( + renderTexture._canvasRenderTarget = new utils.CanvasRenderTarget( renderTexture.width, renderTexture.height, renderTexture.resolution @@ -152,7 +152,7 @@ export class CanvasObjectRendererSystem implements ISystem if (clearColor[3] > 0) { context2D.globalAlpha = clearColor[3] ?? 1; - context2D.fillStyle = hex2string(rgb2hex(clearColor)); + context2D.fillStyle = utils.hex2string(utils.rgb2hex(clearColor)); context2D.fillRect(0, 0, renderTexture.realWidth, renderTexture.realHeight); context2D.globalAlpha = 1; } diff --git a/packages/canvas-renderer/src/CanvasRenderer.ts b/packages/canvas-renderer/src/CanvasRenderer.ts index 41c11bc1b0..9e52ca8123 100644 --- a/packages/canvas-renderer/src/CanvasRenderer.ts +++ b/packages/canvas-renderer/src/CanvasRenderer.ts @@ -1,13 +1,18 @@ import { SystemManager, extensions, - ExtensionType + ExtensionType, + settings, + utils } from '@pixi/core'; + import type { CanvasMaskSystem } from './CanvasMaskSystem'; -import type { BLEND_MODES, RENDERER_TYPE } from '@pixi/constants'; -import type { Matrix, Rectangle } from '@pixi/math'; import type { DisplayObject } from '@pixi/display'; import type { + BLEND_MODES, + RENDERER_TYPE, + Matrix, + Rectangle, IRendererOptions, IRendererPlugins, IRendererRenderOptions, @@ -22,11 +27,10 @@ import type { StartupOptions, ExtensionMetadata, IGenerateTextureOptions } from '@pixi/core'; - import type { CanvasContextSystem, SmoothingEnabledProperties } from './CanvasContextSystem'; import type { CanvasObjectRendererSystem } from './CanvasObjectRendererSystem'; -import { settings } from '@pixi/settings'; -import { deprecation } from '@pixi/utils'; + +const { deprecation } = utils; // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface CanvasRenderer extends GlobalMixins.CanvasRenderer {} diff --git a/packages/canvas-renderer/src/canvasUtils.ts b/packages/canvas-renderer/src/canvasUtils.ts index eba4c58243..0f27ba86a1 100644 --- a/packages/canvas-renderer/src/canvasUtils.ts +++ b/packages/canvas-renderer/src/canvasUtils.ts @@ -1,5 +1,4 @@ -import { hex2rgb, rgb2hex } from '@pixi/utils'; -import { settings } from '@pixi/settings'; +import { settings, utils } from '@pixi/core'; import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes'; import type { Texture } from '@pixi/core'; @@ -242,7 +241,7 @@ export const canvasUtils = { ); context.restore(); - const rgbValues = hex2rgb(color); + const rgbValues = utils.hex2rgb(color); const r = rgbValues[0]; const g = rgbValues[1]; const b = rgbValues[2]; @@ -271,13 +270,13 @@ export const canvasUtils = { { const step = canvasUtils.cacheStepsPerColorChannel; - const rgbValues = hex2rgb(color); + const rgbValues = utils.hex2rgb(color); rgbValues[0] = Math.min(255, (rgbValues[0] / step) * step); rgbValues[1] = Math.min(255, (rgbValues[1] / step) * step); rgbValues[2] = Math.min(255, (rgbValues[2] / step) * step); - return rgb2hex(rgbValues); + return utils.rgb2hex(rgbValues); }, /** diff --git a/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts b/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts index 9118f4892f..d44ac612d6 100644 --- a/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts +++ b/packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts @@ -1,4 +1,4 @@ -import { settings } from '@pixi/settings'; +import { settings } from '@pixi/core'; /** * Creates a little colored canvas diff --git a/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts b/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts index 01c02c056b..d01fc0919f 100644 --- a/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts +++ b/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts @@ -1,4 +1,4 @@ -import { BLEND_MODES } from '@pixi/constants'; +import { BLEND_MODES } from '@pixi/core'; import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; /** diff --git a/packages/canvas-renderer/test/CanvasRenderer.tests.ts b/packages/canvas-renderer/test/CanvasRenderer.tests.ts index b779509ba3..356267acb7 100644 --- a/packages/canvas-renderer/test/CanvasRenderer.tests.ts +++ b/packages/canvas-renderer/test/CanvasRenderer.tests.ts @@ -1,5 +1,5 @@ import { Container } from '@pixi/display'; -import { Matrix } from '@pixi/math'; +import { Matrix } from '@pixi/core'; import { CanvasRenderer } from '@pixi/canvas-renderer'; import '@pixi/canvas-display'; diff --git a/packages/canvas-sprite-tiling/package.json b/packages/canvas-sprite-tiling/package.json index 9ee9b2a9d1..547a27d307 100644 --- a/packages/canvas-sprite-tiling/package.json +++ b/packages/canvas-sprite-tiling/package.json @@ -41,8 +41,7 @@ "peerDependencies": { "@pixi/canvas-renderer": "6.5.2", "@pixi/canvas-sprite": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite-tiling": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/sprite-tiling": "6.5.2" } } diff --git a/packages/canvas-sprite-tiling/src/TilingSprite.ts b/packages/canvas-sprite-tiling/src/TilingSprite.ts index 8ac830e028..fb17854f3f 100644 --- a/packages/canvas-sprite-tiling/src/TilingSprite.ts +++ b/packages/canvas-sprite-tiling/src/TilingSprite.ts @@ -1,7 +1,6 @@ import { TilingSprite } from '@pixi/sprite-tiling'; import { canvasUtils } from '@pixi/canvas-renderer'; -import { CanvasRenderTarget } from '@pixi/utils'; -import { Matrix, Point } from '@pixi/math'; +import { Matrix, Point, utils } from '@pixi/core'; import type { CanvasRenderer } from '@pixi/canvas-renderer'; @@ -36,7 +35,7 @@ TilingSprite.prototype._renderCanvas = function _renderCanvas(renderer: CanvasRe { this._textureID = this._texture._updateID; // cut an object from a spritesheet.. - const tempCanvas = new CanvasRenderTarget(texture._frame.width, + const tempCanvas = new utils.CanvasRenderTarget(texture._frame.width, texture._frame.height, baseTextureResolution); diff --git a/packages/canvas-sprite/package.json b/packages/canvas-sprite/package.json index 595eca611b..8c8fddeb44 100644 --- a/packages/canvas-sprite/package.json +++ b/packages/canvas-sprite/package.json @@ -40,10 +40,7 @@ "peerDependencies": { "@pixi/canvas-display": "6.5.2", "@pixi/canvas-renderer": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/canvas-sprite/src/CanvasSpriteRenderer.ts b/packages/canvas-sprite/src/CanvasSpriteRenderer.ts index 4ca131eee4..559d14911f 100644 --- a/packages/canvas-sprite/src/CanvasSpriteRenderer.ts +++ b/packages/canvas-sprite/src/CanvasSpriteRenderer.ts @@ -1,10 +1,9 @@ -import { SCALE_MODES, BLEND_MODES } from '@pixi/constants'; -import { Matrix, groupD8 } from '@pixi/math'; +import { SCALE_MODES, BLEND_MODES, extensions, ExtensionType, Matrix, groupD8 } from '@pixi/core'; import { canvasUtils } from '@pixi/canvas-renderer'; + import type { CanvasRenderer } from '@pixi/canvas-renderer'; import type { Sprite } from '@pixi/sprite'; import type { ExtensionMetadata } from '@pixi/core'; -import { extensions, ExtensionType } from '@pixi/core'; const canvasRenderWorldTransform = new Matrix(); diff --git a/packages/canvas-sprite/test/CanvasSpriteRenderer.tests.ts b/packages/canvas-sprite/test/CanvasSpriteRenderer.tests.ts index 686016429c..490e28bea5 100644 --- a/packages/canvas-sprite/test/CanvasSpriteRenderer.tests.ts +++ b/packages/canvas-sprite/test/CanvasSpriteRenderer.tests.ts @@ -1,9 +1,7 @@ import '@pixi/canvas-display'; import { CanvasRenderer } from '@pixi/canvas-renderer'; -import { MIPMAP_MODES, SCALE_MODES } from '@pixi/constants'; -import { BaseTexture, CanvasResource, Texture } from '@pixi/core'; +import { MIPMAP_MODES, SCALE_MODES, Rectangle, BaseTexture, CanvasResource, Texture } from '@pixi/core'; import { Container } from '@pixi/display'; -import { Rectangle } from '@pixi/math'; import { Sprite } from '@pixi/sprite'; import '@pixi/canvas-sprite'; diff --git a/packages/compressed-textures/package.json b/packages/compressed-textures/package.json index f2e85ee796..4989954ff3 100644 --- a/packages/compressed-textures/package.json +++ b/packages/compressed-textures/package.json @@ -49,9 +49,6 @@ }, "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/compressed-textures/src/loaders/detectCompressedTextures.ts b/packages/compressed-textures/src/loaders/detectCompressedTextures.ts index c0be55c0ba..f87b46415c 100644 --- a/packages/compressed-textures/src/loaders/detectCompressedTextures.ts +++ b/packages/compressed-textures/src/loaders/detectCompressedTextures.ts @@ -1,6 +1,6 @@ import type { FormatDetectionParser } from '@pixi/assets'; -import { extensions as ext, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { settings, extensions as ext, ExtensionType } from '@pixi/core'; + import type { CompressedTextureExtensionRef, CompressedTextureExtensions } from './compressedTextureExtensions'; let storedGl: WebGLRenderingContext; diff --git a/packages/compressed-textures/src/loaders/loadDDS.ts b/packages/compressed-textures/src/loaders/loadDDS.ts index a0076cf009..dc6d9e0b1f 100644 --- a/packages/compressed-textures/src/loaders/loadDDS.ts +++ b/packages/compressed-textures/src/loaders/loadDDS.ts @@ -1,13 +1,10 @@ -import type { IBaseTextureOptions, Texture } from '@pixi/core'; -import { BaseTexture, extensions, ExtensionType } from '@pixi/core'; -import { getResolutionOfUrl } from '@pixi/utils'; - -import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; +import { BaseTexture, extensions, ExtensionType, settings, utils, ALPHA_MODES, MIPMAP_MODES } from '@pixi/core'; import { checkExtension, createTexture, LoaderParserPriority } from '@pixi/assets'; -import { ALPHA_MODES, MIPMAP_MODES } from '@pixi/constants'; -import { settings } from '@pixi/settings'; import { parseDDS } from '../parsers'; +import type { IBaseTextureOptions, Texture } from '@pixi/core'; +import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; + /** Load our DDS textures! */ export const loadDDS: LoaderParser = { extension: { @@ -34,7 +31,7 @@ export const loadDDS: LoaderParser = { const base = new BaseTexture(resource, { mipmap: MIPMAP_MODES.OFF, alphaMode: ALPHA_MODES.NO_PREMULTIPLIED_ALPHA, - resolution: getResolutionOfUrl(url), + resolution: utils.getResolutionOfUrl(url), ...asset.data, }); diff --git a/packages/compressed-textures/src/loaders/loadKTX.ts b/packages/compressed-textures/src/loaders/loadKTX.ts index 5639e2c2bf..fe189b5bfc 100644 --- a/packages/compressed-textures/src/loaders/loadKTX.ts +++ b/packages/compressed-textures/src/loaders/loadKTX.ts @@ -1,14 +1,10 @@ -import type { IBaseTextureOptions, Texture } from '@pixi/core'; -import { BaseTexture, extensions, ExtensionType } from '@pixi/core'; - -import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; +import { ALPHA_MODES, MIPMAP_MODES, settings, utils, BaseTexture, extensions, ExtensionType } from '@pixi/core'; import { checkExtension, createTexture, LoaderParserPriority } from '@pixi/assets'; - -import { ALPHA_MODES, MIPMAP_MODES } from '@pixi/constants'; -import { settings } from '@pixi/settings'; -import { getResolutionOfUrl } from '@pixi/utils'; import { parseKTX } from '../parsers'; +import type { IBaseTextureOptions, Texture } from '@pixi/core'; +import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; + /** Loads KTX textures! */ export const loadKTX = { extension: { @@ -35,7 +31,7 @@ export const loadKTX = { const options = { mipmap: MIPMAP_MODES.OFF, alphaMode: ALPHA_MODES.NO_PREMULTIPLIED_ALPHA, - resolution: getResolutionOfUrl(url), + resolution: utils.getResolutionOfUrl(url), ...asset.data, }; diff --git a/packages/compressed-textures/src/loaders/resolveCompressedTextureUrl.ts b/packages/compressed-textures/src/loaders/resolveCompressedTextureUrl.ts index 37abd0154b..667a9c292f 100644 --- a/packages/compressed-textures/src/loaders/resolveCompressedTextureUrl.ts +++ b/packages/compressed-textures/src/loaders/resolveCompressedTextureUrl.ts @@ -1,5 +1,4 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { settings, extensions, ExtensionType } from '@pixi/core'; import type { ResolveAsset, ResolveURLParser } from '@pixi/assets'; diff --git a/packages/compressed-textures/src/parsers/parseKTX.ts b/packages/compressed-textures/src/parsers/parseKTX.ts index 9d11979996..c239de1dbb 100644 --- a/packages/compressed-textures/src/parsers/parseKTX.ts +++ b/packages/compressed-textures/src/parsers/parseKTX.ts @@ -1,5 +1,4 @@ -import { FORMATS, TYPES } from '@pixi/constants'; -import { BufferResource } from '@pixi/core'; +import { BufferResource, FORMATS, TYPES } from '@pixi/core'; import { INTERNAL_FORMAT_TO_BYTES_PER_PIXEL } from '../const'; import type { CompressedLevelBuffer } from '../resources'; diff --git a/packages/core/package.json b/packages/core/package.json index b5adb22e54..0d76540c20 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,9 +42,7 @@ "url": "https://opencollective.com/pixijs" }, "dependencies": { - "@types/offscreencanvas": "^2019.6.4" - }, - "peerDependencies": { + "@types/offscreencanvas": "^2019.6.4", "@pixi/constants": "6.5.2", "@pixi/extensions": "6.5.2", "@pixi/math": "6.5.2", diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index f6c75d22e5..c410632c65 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -10,7 +10,16 @@ import './settings'; */ export const VERSION = '$_VERSION'; +/** Export dependencies */ +export * from '@pixi/constants'; export * from '@pixi/extensions'; +export * from '@pixi/math'; +export * from '@pixi/runner'; +export * from '@pixi/settings'; +export * from '@pixi/ticker'; +import * as utils from '@pixi/utils'; +export { utils }; + export * from './textures/resources'; export * from './systems'; export * from './IRenderer'; diff --git a/packages/display/package.json b/packages/display/package.json index 4489b9458d..9c446b2148 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -38,8 +38,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/display/src/Bounds.ts b/packages/display/src/Bounds.ts index 4cc0688aa9..0d8ccd326d 100644 --- a/packages/display/src/Bounds.ts +++ b/packages/display/src/Bounds.ts @@ -1,6 +1,6 @@ -import { Rectangle } from '@pixi/math'; +import { Rectangle } from '@pixi/core'; -import type { IPointData, Transform, Matrix } from '@pixi/math'; +import type { IPointData, Transform, Matrix } from '@pixi/core'; /** * 'Builder' pattern for bounds rectangles. diff --git a/packages/display/src/Container.ts b/packages/display/src/Container.ts index 6292e7cb72..68f51c2f76 100644 --- a/packages/display/src/Container.ts +++ b/packages/display/src/Container.ts @@ -1,10 +1,7 @@ -import { settings } from '@pixi/settings'; -import { removeItems } from '@pixi/utils'; +import { MASK_TYPES, settings, utils } from '@pixi/core'; import { DisplayObject } from './DisplayObject'; -import type { Matrix, Rectangle } from '@pixi/math'; -import { MASK_TYPES } from '@pixi/constants'; -import type { MaskData, Renderer } from '@pixi/core'; +import type { MaskData, Renderer, Matrix, Rectangle } from '@pixi/core'; import type { IDestroyOptions } from './DisplayObject'; function sortChildren(a: DisplayObject, b: DisplayObject): number @@ -258,7 +255,7 @@ export class Container extends DisplayO const currentIndex = this.getChildIndex(child); - removeItems(this.children, currentIndex, 1); // remove from old position + utils.removeItems(this.children, currentIndex, 1); // remove from old position this.children.splice(index, 0, child); // add at new position this.onChildrenChange(index); @@ -305,7 +302,7 @@ export class Container extends DisplayO child.parent = null; // ensure child transform will be recalculated child.transform._parentID = -1; - removeItems(this.children, index, 1); + utils.removeItems(this.children, index, 1); // ensure bounds will be recalculated this._boundsID++; @@ -331,7 +328,7 @@ export class Container extends DisplayO // ensure child transform will be recalculated.. child.parent = null; child.transform._parentID = -1; - removeItems(this.children, index, 1); + utils.removeItems(this.children, index, 1); // ensure bounds will be recalculated this._boundsID++; diff --git a/packages/display/src/DisplayObject.ts b/packages/display/src/DisplayObject.ts index 9d6f5de88a..bab7be06b4 100644 --- a/packages/display/src/DisplayObject.ts +++ b/packages/display/src/DisplayObject.ts @@ -1,11 +1,8 @@ -import { DEG_TO_RAD, RAD_TO_DEG, Rectangle, Transform } from '@pixi/math'; -import { EventEmitter } from '@pixi/utils'; +import { DEG_TO_RAD, RAD_TO_DEG, Rectangle, Transform, utils } from '@pixi/core'; import { Bounds } from './Bounds'; import type { Container } from './Container'; -import type { Filter, MaskData, Renderer } from '@pixi/core'; -import type { IPointData, ObservablePoint, Matrix, Point } from '@pixi/math'; -import type { Dict } from '@pixi/utils'; +import type { Filter, MaskData, Renderer, IPointData, ObservablePoint, Matrix, Point } from '@pixi/core'; export interface IDestroyOptions { @@ -14,7 +11,7 @@ export interface IDestroyOptions baseTexture?: boolean; } -export interface DisplayObject extends Omit, EventEmitter {} +export interface DisplayObject extends Omit, utils.EventEmitter {} /** * The base class for all objects that are rendered on the screen. @@ -201,7 +198,7 @@ export interface DisplayObject extends Omit): void + static mixin(source: utils.Dict): void { // in ES8/ES2017, this would be really easy: // Object.defineProperties(DisplayObject.prototype, Object.getOwnPropertyDescriptors(source)); diff --git a/packages/display/src/settings.ts b/packages/display/src/settings.ts index 1368a2dc1e..fc583d45e0 100644 --- a/packages/display/src/settings.ts +++ b/packages/display/src/settings.ts @@ -1,4 +1,4 @@ -import { settings } from '@pixi/settings'; +import { settings } from '@pixi/core'; /** * Sets the default value for the container property 'sortableChildren'. diff --git a/packages/display/test/Container.tests.ts b/packages/display/test/Container.tests.ts index 56c7969d98..a4ed1dd379 100644 --- a/packages/display/test/Container.tests.ts +++ b/packages/display/test/Container.tests.ts @@ -1,8 +1,7 @@ -import { Renderer } from '@pixi/core'; +import { Renderer, Rectangle } from '@pixi/core'; import { Container, DisplayObject } from '@pixi/display'; import { AlphaFilter } from '@pixi/filter-alpha'; import { Graphics } from '@pixi/graphics'; -import { Rectangle } from '@pixi/math'; function testAddChild(fn: any) { diff --git a/packages/display/test/DisplayObject.tests.ts b/packages/display/test/DisplayObject.tests.ts index 5481b56035..0064bacea8 100755 --- a/packages/display/test/DisplayObject.tests.ts +++ b/packages/display/test/DisplayObject.tests.ts @@ -1,5 +1,5 @@ import { DisplayObject, Container } from '@pixi/display'; -import { RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; +import { RAD_TO_DEG, DEG_TO_RAD } from '@pixi/core'; describe('DisplayObject', () => { diff --git a/packages/display/test/toGlobal.tests.ts b/packages/display/test/toGlobal.tests.ts index bc2d7076d6..6af80d591a 100644 --- a/packages/display/test/toGlobal.tests.ts +++ b/packages/display/test/toGlobal.tests.ts @@ -1,5 +1,5 @@ import { Container } from '@pixi/display'; -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; describe('toGlobal', () => { diff --git a/packages/display/test/toLocal.tests.ts b/packages/display/test/toLocal.tests.ts index 9114179faf..bd7793a107 100644 --- a/packages/display/test/toLocal.tests.ts +++ b/packages/display/test/toLocal.tests.ts @@ -1,5 +1,5 @@ import { Container } from '@pixi/display'; -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; describe('toLocal', () => { diff --git a/packages/events/package.json b/packages/events/package.json index 05c32fa2d1..fdf7fad9a5 100644 --- a/packages/events/package.json +++ b/packages/events/package.json @@ -45,8 +45,7 @@ "url": "https://github.com/pixijs/pixi.js/issues" }, "peerDependencies": { - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/display": "6.5.2" } } diff --git a/packages/events/src/EventBoundary.ts b/packages/events/src/EventBoundary.ts index cf17247b69..3535afc23e 100644 --- a/packages/events/src/EventBoundary.ts +++ b/packages/events/src/EventBoundary.ts @@ -1,8 +1,7 @@ -import { EventEmitter } from '@pixi/utils'; import { FederatedMouseEvent } from './FederatedMouseEvent'; import { FederatedPointerEvent } from './FederatedPointerEvent'; import { FederatedWheelEvent } from './FederatedWheelEvent'; -import { Point } from '@pixi/math'; +import { Point, utils } from '@pixi/core'; import type { Cursor, FederatedEventTarget } from './FederatedEventTarget'; import type { DisplayObject } from '@pixi/display'; @@ -134,7 +133,7 @@ export class EventBoundary * Special events that do not bubble all the way to the root target are not emitted from here, * e.g. pointerenter, pointerleave, click. */ - public dispatch: EventEmitter = new EventEmitter(); + public dispatch: utils.EventEmitter = new utils.EventEmitter(); /** The cursor preferred by the event targets underneath this boundary. */ public cursor: Cursor | string; diff --git a/packages/events/src/EventSystem.ts b/packages/events/src/EventSystem.ts index b88dcf7bf0..6558b7c3b3 100644 --- a/packages/events/src/EventSystem.ts +++ b/packages/events/src/EventSystem.ts @@ -4,9 +4,8 @@ import { FederatedPointerEvent } from './FederatedPointerEvent'; import { FederatedWheelEvent } from './FederatedWheelEvent'; import { extensions, ExtensionType } from '@pixi/core'; -import type { IRenderableObject, ExtensionMetadata } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; -import type { IPointData } from '@pixi/math'; +import type { IRenderableObject, ExtensionMetadata, IPointData } from '@pixi/core'; const MOUSE_POINTER_ID = 1; const TOUCH_TO_POINTER: Record = { diff --git a/packages/events/src/FederatedEvent.ts b/packages/events/src/FederatedEvent.ts index 98e3c6eb0b..71d75b44a3 100644 --- a/packages/events/src/FederatedEvent.ts +++ b/packages/events/src/FederatedEvent.ts @@ -1,4 +1,4 @@ -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; import type { EventBoundary } from './EventBoundary'; import type { FederatedEventTarget } from './FederatedEventTarget'; diff --git a/packages/events/src/FederatedEventTarget.ts b/packages/events/src/FederatedEventTarget.ts index ebaf8e8bbe..1340c32f40 100644 --- a/packages/events/src/FederatedEventTarget.ts +++ b/packages/events/src/FederatedEventTarget.ts @@ -1,7 +1,7 @@ import { DisplayObject } from '@pixi/display'; import { FederatedEvent } from './FederatedEvent'; -import type { EventEmitter } from '@pixi/utils'; +import type { utils } from '@pixi/core'; export type Cursor = 'auto' | 'default' @@ -50,7 +50,7 @@ export interface IHitArea * Describes the shape for a {@link FederatedEvent}'s' `eventTarget`. * @memberof PIXI */ -export interface FederatedEventTarget extends EventEmitter, EventTarget +export interface FederatedEventTarget extends utils.EventEmitter, EventTarget { /** The cursor preferred when the mouse pointer is hovering over. */ cursor: Cursor | string; @@ -73,7 +73,7 @@ export interface FederatedEventTarget extends EventEmitter, EventTarget export const FederatedDisplayObject: Omit< FederatedEventTarget, -'parent' | 'children' | keyof EventEmitter | 'cursor' +'parent' | 'children' | keyof utils.EventEmitter | 'cursor' > = { /** * Enable interaction events for the DisplayObject. Touch, pointer and mouse @@ -153,7 +153,7 @@ FederatedEventTarget, type = capture ? `${type}capture` : type; listener = typeof listener === 'function' ? listener : listener.handleEvent; - (this as unknown as EventEmitter).on(type, listener, context); + (this as unknown as utils.EventEmitter).on(type, listener, context); }, /** @@ -178,7 +178,7 @@ FederatedEventTarget, type = capture ? `${type}capture` : type; listener = typeof listener === 'function' ? listener : listener.handleEvent; - (this as unknown as EventEmitter).off(type, listener, context); + (this as unknown as utils.EventEmitter).off(type, listener, context); }, /** diff --git a/packages/events/src/FederatedMouseEvent.ts b/packages/events/src/FederatedMouseEvent.ts index dd91314495..7308859b09 100644 --- a/packages/events/src/FederatedMouseEvent.ts +++ b/packages/events/src/FederatedMouseEvent.ts @@ -1,5 +1,5 @@ import { FederatedEvent } from './FederatedEvent'; -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; /** * A {@link PIXI.FederatedEvent} for mouse events. diff --git a/packages/extract/package.json b/packages/extract/package.json index f5b1928f0c..d012398c90 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -38,8 +38,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/extract/src/Extract.ts b/packages/extract/src/Extract.ts index 6148a17b77..e2510f2334 100644 --- a/packages/extract/src/Extract.ts +++ b/packages/extract/src/Extract.ts @@ -1,6 +1,4 @@ -import { CanvasRenderTarget } from '@pixi/utils'; -import { Rectangle } from '@pixi/math'; -import { extensions, ExtensionType, RenderTexture } from '@pixi/core'; +import { Rectangle, utils, extensions, ExtensionType, RenderTexture } from '@pixi/core'; import type { Renderer, ISystem, ExtensionMetadata } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; @@ -131,7 +129,7 @@ export class Extract implements ISystem const width = Math.round(frame.width * resolution); const height = Math.round(frame.height * resolution); - let canvasBuffer = new CanvasRenderTarget(width, height, 1); + let canvasBuffer = new utils.CanvasRenderTarget(width, height, 1); const webglPixels = new Uint8Array(BYTES_PER_PIXEL * width * height); @@ -158,7 +156,7 @@ export class Extract implements ISystem // pulling pixels if (flipY) { - const target = new CanvasRenderTarget(canvasBuffer.width, canvasBuffer.height, 1); + const target = new utils.CanvasRenderTarget(canvasBuffer.width, canvasBuffer.height, 1); target.context.scale(1, -1); diff --git a/packages/extract/test/Extract.tests.ts b/packages/extract/test/Extract.tests.ts index a797ede6ad..207e7701ac 100644 --- a/packages/extract/test/Extract.tests.ts +++ b/packages/extract/test/Extract.tests.ts @@ -1,11 +1,9 @@ import { Sprite } from '@pixi/sprite'; -import { skipHello } from '@pixi/utils'; -import { Texture, RenderTexture, Renderer } from '@pixi/core'; +import { Rectangle, utils, Texture, RenderTexture, Renderer } from '@pixi/core'; import { Extract } from '@pixi/extract'; -import { Rectangle } from '@pixi/math'; -skipHello(); +utils.skipHello(); describe('Extract', () => { diff --git a/packages/filter-blur/package.json b/packages/filter-blur/package.json index 4e85ca6f78..158f76e9ae 100644 --- a/packages/filter-blur/package.json +++ b/packages/filter-blur/package.json @@ -39,7 +39,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/settings": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/filter-blur/src/BlurFilter.ts b/packages/filter-blur/src/BlurFilter.ts index 096ea02d74..d5b08b2618 100644 --- a/packages/filter-blur/src/BlurFilter.ts +++ b/packages/filter-blur/src/BlurFilter.ts @@ -1,10 +1,7 @@ -import { Filter } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { Filter, settings, CLEAR_MODES } from '@pixi/core'; import { BlurFilterPass } from './BlurFilterPass'; -import { CLEAR_MODES } from '@pixi/constants'; -import type { FilterSystem, RenderTexture } from '@pixi/core'; -import type { BLEND_MODES } from '@pixi/constants'; +import type { BLEND_MODES, FilterSystem, RenderTexture } from '@pixi/core'; /** * The BlurFilter applies a Gaussian blur to an object. diff --git a/packages/filter-blur/src/BlurFilterPass.ts b/packages/filter-blur/src/BlurFilterPass.ts index 87806f2948..eb5922b14b 100644 --- a/packages/filter-blur/src/BlurFilterPass.ts +++ b/packages/filter-blur/src/BlurFilterPass.ts @@ -1,8 +1,6 @@ -import { Filter } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { Filter, settings, CLEAR_MODES } from '@pixi/core'; import { generateBlurVertSource } from './generateBlurVertSource'; import { generateBlurFragSource } from './generateBlurFragSource'; -import { CLEAR_MODES } from '@pixi/constants'; import type { FilterSystem, RenderTexture } from '@pixi/core'; diff --git a/packages/filter-color-matrix/src/ColorMatrixFilter.ts b/packages/filter-color-matrix/src/ColorMatrixFilter.ts index 4c4038c257..8f6685f494 100644 --- a/packages/filter-color-matrix/src/ColorMatrixFilter.ts +++ b/packages/filter-color-matrix/src/ColorMatrixFilter.ts @@ -1,9 +1,9 @@ import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; -import type { ArrayFixed } from '@pixi/utils'; +import type { utils } from '@pixi/core'; -export type ColorMatrix = ArrayFixed; +export type ColorMatrix = utils.ArrayFixed; /** * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA diff --git a/packages/filter-displacement/package.json b/packages/filter-displacement/package.json index 947ebc075d..04782f407c 100644 --- a/packages/filter-displacement/package.json +++ b/packages/filter-displacement/package.json @@ -39,7 +39,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/filter-displacement/src/DisplacementFilter.ts b/packages/filter-displacement/src/DisplacementFilter.ts index 545bd7859e..03e7e5446c 100644 --- a/packages/filter-displacement/src/DisplacementFilter.ts +++ b/packages/filter-displacement/src/DisplacementFilter.ts @@ -1,10 +1,8 @@ -import { Filter } from '@pixi/core'; -import { Matrix, Point } from '@pixi/math'; +import { Matrix, Point, Filter } from '@pixi/core'; import fragment from './displacement.frag'; import vertex from './displacement.vert'; -import type { CLEAR_MODES } from '@pixi/constants'; -import type { FilterSystem, RenderTexture, Texture, ISpriteMaskTarget } from '@pixi/core'; +import type { CLEAR_MODES, FilterSystem, RenderTexture, Texture, ISpriteMaskTarget } from '@pixi/core'; /** * The DisplacementFilter class uses the pixel values from the specified texture diff --git a/packages/graphics-extras/package.json b/packages/graphics-extras/package.json index aec75afb03..0c6ff5595d 100644 --- a/packages/graphics-extras/package.json +++ b/packages/graphics-extras/package.json @@ -36,7 +36,7 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/graphics": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/graphics": "6.5.2" } } diff --git a/packages/graphics-extras/src/drawStar.ts b/packages/graphics-extras/src/drawStar.ts index 20aadac5d2..265973139e 100644 --- a/packages/graphics-extras/src/drawStar.ts +++ b/packages/graphics-extras/src/drawStar.ts @@ -1,5 +1,5 @@ import type { Graphics } from '@pixi/graphics'; -import { Polygon, PI_2 } from '@pixi/math'; +import { Polygon, PI_2 } from '@pixi/core'; /** * Draw a star shape with an arbitrary number of points. diff --git a/packages/graphics/package.json b/packages/graphics/package.json index ebf0f4a6c7..7ae63baab1 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -38,11 +38,8 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/graphics/src/Graphics.ts b/packages/graphics/src/Graphics.ts index 8f8d1eb3f3..f9cfe1efe5 100644 --- a/packages/graphics/src/Graphics.ts +++ b/packages/graphics/src/Graphics.ts @@ -8,21 +8,23 @@ import { RoundedRectangle, Matrix, SHAPES, -} from '@pixi/math'; + BLEND_MODES, + Texture, + UniformGroup, + State, + Shader, + utils +} from '@pixi/core'; -import type { Renderer, BatchDrawCall } from '@pixi/core'; -import { Texture, UniformGroup, State, Shader } from '@pixi/core'; import { BezierUtils, QuadraticUtils, ArcUtils } from './utils'; -import { hex2rgb } from '@pixi/utils'; import { GraphicsGeometry } from './GraphicsGeometry'; import { FillStyle } from './styles/FillStyle'; import { LineStyle } from './styles/LineStyle'; -import { BLEND_MODES } from '@pixi/constants'; import { Container } from '@pixi/display'; +import { LINE_JOIN, LINE_CAP } from './const'; -import type { IShape, IPointData } from '@pixi/math'; +import type { IShape, IPointData, Renderer, BatchDrawCall } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; -import { LINE_JOIN, LINE_CAP } from './const'; /** Batch element computed from Graphics geometry */ export interface IGraphicsBatchElement @@ -879,7 +881,7 @@ export class Graphics extends Container blendMode, indices, uvs, - _batchRGB: hex2rgb(color) as Array, + _batchRGB: utils.hex2rgb(color) as Array, _tintRGB: color, _texture: gI.style.texture, alpha: gI.style.alpha, @@ -1053,7 +1055,7 @@ export class Graphics extends Container { this.batchTint = this.tint; - const tintRGB = hex2rgb(this.tint, temp); + const tintRGB = utils.hex2rgb(this.tint, temp); for (let i = 0; i < this.batches.length; i++) { diff --git a/packages/graphics/src/GraphicsData.ts b/packages/graphics/src/GraphicsData.ts index 199172d7ac..b422075d18 100644 --- a/packages/graphics/src/GraphicsData.ts +++ b/packages/graphics/src/GraphicsData.ts @@ -1,4 +1,4 @@ -import type { Matrix, SHAPES, IShape } from '@pixi/math'; +import type { Matrix, SHAPES, IShape } from '@pixi/core'; import type { FillStyle } from './styles/FillStyle'; import type { LineStyle } from './styles/LineStyle'; diff --git a/packages/graphics/src/GraphicsGeometry.ts b/packages/graphics/src/GraphicsGeometry.ts index ce8571940e..dca11cac68 100644 --- a/packages/graphics/src/GraphicsGeometry.ts +++ b/packages/graphics/src/GraphicsGeometry.ts @@ -7,22 +7,21 @@ import { DRAW_CALL_POOL, } from './utils'; -import type { - Texture } from '@pixi/core'; import { BatchGeometry, BatchDrawCall, BatchTextureArray, - BaseTexture + BaseTexture, + DRAW_MODES, + WRAP_MODES, + Point, + utils, } from '@pixi/core'; -import { DRAW_MODES, WRAP_MODES } from '@pixi/constants'; -import { Point } from '@pixi/math'; import { GraphicsData } from './GraphicsData'; -import { premultiplyTint } from '@pixi/utils'; import { Bounds } from '@pixi/display'; -import type { Circle, Ellipse, Polygon, Rectangle, RoundedRectangle, IPointData, Matrix } from '@pixi/math'; +import type { Texture, Circle, Ellipse, Polygon, Rectangle, RoundedRectangle, IPointData, Matrix } from '@pixi/core'; import type { FillStyle } from './styles/FillStyle'; import type { LineStyle } from './styles/LineStyle'; @@ -812,7 +811,7 @@ export class GraphicsGeometry extends BatchGeometry // TODO use the premultiply bits Ivan added const rgb = (color >> 16) + (color & 0xff00) + ((color & 0xff) << 16); - const rgba = premultiplyTint(rgb, alpha); + const rgba = utils.premultiplyTint(rgb, alpha); colors.length = Math.max(colors.length, offset + size); diff --git a/packages/graphics/src/index.ts b/packages/graphics/src/index.ts index b767408768..2e398eb3a5 100644 --- a/packages/graphics/src/index.ts +++ b/packages/graphics/src/index.ts @@ -21,7 +21,7 @@ import { } from './utils'; import type { BatchDrawCall } from '@pixi/core/'; import type { IShapeBuildCommand } from './utils/IShapeBuildCommand'; -import type { SHAPES } from '@pixi/math'; +import type { SHAPES } from '@pixi/core'; export const graphicsUtils = { buildPoly: buildPoly as IShapeBuildCommand, diff --git a/packages/graphics/src/styles/FillStyle.ts b/packages/graphics/src/styles/FillStyle.ts index 8e879ecd59..6d1c72d31f 100644 --- a/packages/graphics/src/styles/FillStyle.ts +++ b/packages/graphics/src/styles/FillStyle.ts @@ -1,5 +1,5 @@ import { Texture } from '@pixi/core'; -import type { Matrix } from '@pixi/math'; +import type { Matrix } from '@pixi/core'; /** * Fill style object for Graphics. diff --git a/packages/graphics/src/utils/ArcUtils.ts b/packages/graphics/src/utils/ArcUtils.ts index 24e65ea0c7..18eb160f31 100644 --- a/packages/graphics/src/utils/ArcUtils.ts +++ b/packages/graphics/src/utils/ArcUtils.ts @@ -1,5 +1,5 @@ import { GRAPHICS_CURVES } from '../const'; -import { PI_2 } from '@pixi/math'; +import { PI_2 } from '@pixi/core'; interface IArcLikeShape { diff --git a/packages/graphics/src/utils/buildCircle.ts b/packages/graphics/src/utils/buildCircle.ts index 7771b57d83..0df0ad43f7 100644 --- a/packages/graphics/src/utils/buildCircle.ts +++ b/packages/graphics/src/utils/buildCircle.ts @@ -1,7 +1,7 @@ // for type only -import { SHAPES } from '@pixi/math'; +import { SHAPES } from '@pixi/core'; -import type { Circle, Ellipse, RoundedRectangle } from '@pixi/math'; +import type { Circle, Ellipse, RoundedRectangle } from '@pixi/core'; import type { IShapeBuildCommand } from './IShapeBuildCommand'; /** diff --git a/packages/graphics/src/utils/buildLine.ts b/packages/graphics/src/utils/buildLine.ts index 14b69174f8..0d2d5ec70c 100644 --- a/packages/graphics/src/utils/buildLine.ts +++ b/packages/graphics/src/utils/buildLine.ts @@ -1,6 +1,6 @@ -import { Point, SHAPES } from '@pixi/math'; +import { Point, SHAPES } from '@pixi/core'; -import type { Polygon } from '@pixi/math'; +import type { Polygon } from '@pixi/core'; import type { GraphicsData } from '../GraphicsData'; import type { GraphicsGeometry } from '../GraphicsGeometry'; import { LINE_JOIN, LINE_CAP, GRAPHICS_CURVES } from '../const'; diff --git a/packages/graphics/src/utils/buildPoly.ts b/packages/graphics/src/utils/buildPoly.ts index 3b749559ba..aac6e2cb51 100644 --- a/packages/graphics/src/utils/buildPoly.ts +++ b/packages/graphics/src/utils/buildPoly.ts @@ -1,7 +1,7 @@ -import { earcut } from '@pixi/utils'; +import { utils } from '@pixi/core'; import type { IShapeBuildCommand } from './IShapeBuildCommand'; -import type { Polygon } from '@pixi/math'; +import type { Polygon } from '@pixi/core'; function fixOrientation(points: number[], hole = false) { @@ -83,7 +83,7 @@ export const buildPoly: IShapeBuildCommand = { } // sort color - const triangles = earcut(points, holeArray, 2); + const triangles = utils.earcut(points, holeArray, 2); if (!triangles) { diff --git a/packages/graphics/src/utils/buildRectangle.ts b/packages/graphics/src/utils/buildRectangle.ts index 63a5a681c7..6e23ef00e9 100644 --- a/packages/graphics/src/utils/buildRectangle.ts +++ b/packages/graphics/src/utils/buildRectangle.ts @@ -1,5 +1,5 @@ import type { IShapeBuildCommand } from './IShapeBuildCommand'; -import type { Rectangle } from '@pixi/math'; +import type { Rectangle } from '@pixi/core'; /** * Builds a rectangle to draw diff --git a/packages/graphics/src/utils/index.ts b/packages/graphics/src/utils/index.ts index 4f7952572c..e47579adbc 100644 --- a/packages/graphics/src/utils/index.ts +++ b/packages/graphics/src/utils/index.ts @@ -24,7 +24,7 @@ export * from './BatchPart'; // for type only import type { BatchPart } from './BatchPart'; -import { SHAPES } from '@pixi/math'; +import { SHAPES } from '@pixi/core'; import type { BatchDrawCall } from '@pixi/core'; import type { IShapeBuildCommand } from './IShapeBuildCommand'; diff --git a/packages/graphics/test/Graphics.tests.ts b/packages/graphics/test/Graphics.tests.ts index 9a449d757f..37149c3a6b 100644 --- a/packages/graphics/test/Graphics.tests.ts +++ b/packages/graphics/test/Graphics.tests.ts @@ -1,12 +1,8 @@ -import { Texture } from '@pixi/core'; +import { Texture, BLEND_MODES, Point, Matrix, SHAPES, Polygon, utils } from '@pixi/core'; import { Graphics, GRAPHICS_CURVES, FillStyle, LineStyle, graphicsUtils, LINE_CAP } from '@pixi/graphics'; const { FILL_COMMANDS, buildLine } = graphicsUtils; -import { BLEND_MODES } from '@pixi/constants'; -import { Point, Matrix, SHAPES, Polygon } from '@pixi/math'; -import { skipHello } from '@pixi/utils'; - -skipHello(); +utils.skipHello(); describe('Graphics', () => { diff --git a/packages/math-extras/package.json b/packages/math-extras/package.json index fd9c0d508d..bc0958a0a4 100644 --- a/packages/math-extras/package.json +++ b/packages/math-extras/package.json @@ -40,6 +40,6 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/math-extras/src/index.ts b/packages/math-extras/src/index.ts index 225437615b..560da84449 100644 --- a/packages/math-extras/src/index.ts +++ b/packages/math-extras/src/index.ts @@ -1,8 +1,8 @@ import './pointExtras'; import './rectangleExtras'; -import type { IPointData } from '@pixi/math'; -import { Point } from '@pixi/math'; +import type { IPointData } from '@pixi/core'; +import { Point } from '@pixi/core'; /** * The idea of a relative epsilon comparison is to find the difference between the two numbers, diff --git a/packages/math-extras/src/pointExtras.ts b/packages/math-extras/src/pointExtras.ts index a25fd34b2f..511f1304a0 100644 --- a/packages/math-extras/src/pointExtras.ts +++ b/packages/math-extras/src/pointExtras.ts @@ -1,5 +1,5 @@ -import type { IPointData } from '@pixi/math'; -import { Point, ObservablePoint } from '@pixi/math'; +import type { IPointData } from '@pixi/core'; +import { Point, ObservablePoint } from '@pixi/core'; const mixins: any = { /** diff --git a/packages/math-extras/src/rectangleExtras.ts b/packages/math-extras/src/rectangleExtras.ts index ac6c6c9e1d..3afd6eaaef 100644 --- a/packages/math-extras/src/rectangleExtras.ts +++ b/packages/math-extras/src/rectangleExtras.ts @@ -1,4 +1,4 @@ -import { Rectangle } from '@pixi/math'; +import { Rectangle } from '@pixi/core'; /** * Determines whether the `other` Rectangle is contained within `this` Rectangle object. diff --git a/packages/math-extras/test/Point.tests.ts b/packages/math-extras/test/Point.tests.ts index adc8a3ad5a..955416190e 100644 --- a/packages/math-extras/test/Point.tests.ts +++ b/packages/math-extras/test/Point.tests.ts @@ -1,4 +1,4 @@ -import { ObservablePoint, Point } from '@pixi/math'; +import { ObservablePoint, Point } from '@pixi/core'; import '@pixi/math-extras'; diff --git a/packages/math-extras/test/Rectangle.tests.ts b/packages/math-extras/test/Rectangle.tests.ts index b22a6c325e..49423d211c 100644 --- a/packages/math-extras/test/Rectangle.tests.ts +++ b/packages/math-extras/test/Rectangle.tests.ts @@ -1,4 +1,4 @@ -import { Rectangle } from '@pixi/math'; +import { Rectangle } from '@pixi/core'; import '@pixi/math-extras'; diff --git a/packages/math-extras/test/lineIntersection.tests.ts b/packages/math-extras/test/lineIntersection.tests.ts index 8c80540575..964bf1342b 100644 --- a/packages/math-extras/test/lineIntersection.tests.ts +++ b/packages/math-extras/test/lineIntersection.tests.ts @@ -1,4 +1,4 @@ -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; import { lineIntersection } from '@pixi/math-extras'; describe('lineIntersection', () => diff --git a/packages/math-extras/test/segmentIntersection.tests.ts b/packages/math-extras/test/segmentIntersection.tests.ts index d08a1f148b..4b646e72ce 100644 --- a/packages/math-extras/test/segmentIntersection.tests.ts +++ b/packages/math-extras/test/segmentIntersection.tests.ts @@ -1,4 +1,4 @@ -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; import { segmentIntersection } from '@pixi/math-extras'; diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 653b36c175..2890ee2291 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -38,10 +38,7 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/mesh": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/mesh": "6.5.2" } } diff --git a/packages/mesh-extras/src/SimpleMesh.ts b/packages/mesh-extras/src/SimpleMesh.ts index 41cde93eb9..33cb426961 100644 --- a/packages/mesh-extras/src/SimpleMesh.ts +++ b/packages/mesh-extras/src/SimpleMesh.ts @@ -1,8 +1,7 @@ import { Mesh, MeshGeometry, MeshMaterial } from '@pixi/mesh'; import { Texture } from '@pixi/core'; -import type { ITypedArray, IArrayBuffer, Renderer } from '@pixi/core'; -import type { DRAW_MODES } from '@pixi/constants'; +import type { DRAW_MODES, ITypedArray, IArrayBuffer, Renderer } from '@pixi/core'; /** * The Simple Mesh class mimics Mesh in PixiJS v4, providing easy-to-use constructor arguments. diff --git a/packages/mesh-extras/src/SimpleRope.ts b/packages/mesh-extras/src/SimpleRope.ts index a3e3506b10..87074d0e3e 100644 --- a/packages/mesh-extras/src/SimpleRope.ts +++ b/packages/mesh-extras/src/SimpleRope.ts @@ -1,9 +1,8 @@ import { Mesh, MeshMaterial } from '@pixi/mesh'; -import { WRAP_MODES } from '@pixi/constants'; +import { WRAP_MODES } from '@pixi/core'; import { RopeGeometry } from './geometry/RopeGeometry'; -import type { Texture, Renderer } from '@pixi/core'; -import type { IPoint } from '@pixi/math'; +import type { IPoint, Texture, Renderer } from '@pixi/core'; /** * The rope allows you to draw a texture across several points and then manipulate these points diff --git a/packages/mesh-extras/src/geometry/RopeGeometry.ts b/packages/mesh-extras/src/geometry/RopeGeometry.ts index 2b7fbe43f4..0d641f20b7 100644 --- a/packages/mesh-extras/src/geometry/RopeGeometry.ts +++ b/packages/mesh-extras/src/geometry/RopeGeometry.ts @@ -1,5 +1,5 @@ import { MeshGeometry } from '@pixi/mesh'; -import type { IPoint } from '@pixi/math'; +import type { IPoint } from '@pixi/core'; /** * RopeGeometry allows you to draw a geometry across several points and then manipulate these points. diff --git a/packages/mesh-extras/test/NineSlicePlane.tests.ts b/packages/mesh-extras/test/NineSlicePlane.tests.ts index ca9e11917a..3f3c279755 100644 --- a/packages/mesh-extras/test/NineSlicePlane.tests.ts +++ b/packages/mesh-extras/test/NineSlicePlane.tests.ts @@ -1,8 +1,7 @@ import { NineSlicePlane } from '@pixi/mesh-extras'; -import { skipHello } from '@pixi/utils'; -import { Texture } from '@pixi/core'; +import { Texture, utils } from '@pixi/core'; -skipHello(); +utils.skipHello(); describe('NineSlicePlane', () => { diff --git a/packages/mesh-extras/test/SimpleMesh.tests.ts b/packages/mesh-extras/test/SimpleMesh.tests.ts index cba2cbdac6..29b31b3917 100644 --- a/packages/mesh-extras/test/SimpleMesh.tests.ts +++ b/packages/mesh-extras/test/SimpleMesh.tests.ts @@ -1,8 +1,7 @@ import { SimpleMesh } from '@pixi/mesh-extras'; -import { skipHello } from '@pixi/utils'; -import { Renderer } from '@pixi/core'; +import { Renderer, utils } from '@pixi/core'; -skipHello(); +utils.skipHello(); describe('SimpleMesh', () => { diff --git a/packages/mesh-extras/test/SimplePlane.tests.ts b/packages/mesh-extras/test/SimplePlane.tests.ts index d0302cfd1c..906aac0c4e 100644 --- a/packages/mesh-extras/test/SimplePlane.tests.ts +++ b/packages/mesh-extras/test/SimplePlane.tests.ts @@ -1,12 +1,11 @@ -import type { PlaneGeometry } from '@pixi/mesh-extras'; import { SimplePlane } from '@pixi/mesh-extras'; -import { skipHello } from '@pixi/utils'; -import { Point } from '@pixi/math'; -import { Renderer, RenderTexture, Texture } from '@pixi/core'; +import { Point, Renderer, RenderTexture, Texture, utils } from '@pixi/core'; import { Cache, loadTextures } from '@pixi/assets'; import { Loader } from '../../assets/src/loader/Loader'; -skipHello(); +import type { PlaneGeometry } from '@pixi/mesh-extras'; + +utils.skipHello(); describe('SimplePlane', () => { diff --git a/packages/mesh-extras/test/SimpleRope.tests.ts b/packages/mesh-extras/test/SimpleRope.tests.ts index fb244f28e4..0fe7ef075f 100644 --- a/packages/mesh-extras/test/SimpleRope.tests.ts +++ b/packages/mesh-extras/test/SimpleRope.tests.ts @@ -1,11 +1,9 @@ import { Cache, loadTextures } from '@pixi/assets'; -import { Renderer, Texture } from '@pixi/core'; -import { Point } from '@pixi/math'; +import { Renderer, Texture, Point, utils } from '@pixi/core'; import { SimpleRope } from '@pixi/mesh-extras'; -import { skipHello } from '@pixi/utils'; import { Loader } from '../../assets/src/loader/Loader'; -skipHello(); +utils.skipHello(); describe('SimpleRope', () => { diff --git a/packages/mesh/package.json b/packages/mesh/package.json index 32312a42df..d80bd5d492 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -38,11 +38,7 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } } diff --git a/packages/mesh/src/Mesh.ts b/packages/mesh/src/Mesh.ts index 888ae42ca6..9989b65882 100644 --- a/packages/mesh/src/Mesh.ts +++ b/packages/mesh/src/Mesh.ts @@ -1,15 +1,10 @@ -import { State } from '@pixi/core'; -import { Point, Polygon } from '@pixi/math'; -import type { BLEND_MODES } from '@pixi/constants'; -import { DRAW_MODES } from '@pixi/constants'; +import { State, DRAW_MODES, settings, Point, Polygon } from '@pixi/core'; import { Container } from '@pixi/display'; -import { settings } from '@pixi/settings'; import { MeshBatchUvs } from './MeshBatchUvs'; -import type { MeshMaterial } from './MeshMaterial'; +import type { MeshMaterial } from './MeshMaterial'; import type { IDestroyOptions } from '@pixi/display'; -import type { Texture, Renderer, Geometry, Buffer, Shader } from '@pixi/core'; -import type { IPointData } from '@pixi/math'; +import type { BLEND_MODES, IPointData, Texture, Renderer, Geometry, Buffer, Shader } from '@pixi/core'; const tempPoint = new Point(); const tempPolygon = new Polygon(); diff --git a/packages/mesh/src/MeshGeometry.ts b/packages/mesh/src/MeshGeometry.ts index 1e8618dca3..254101177e 100644 --- a/packages/mesh/src/MeshGeometry.ts +++ b/packages/mesh/src/MeshGeometry.ts @@ -1,5 +1,4 @@ -import { TYPES } from '@pixi/constants'; -import { Buffer, Geometry } from '@pixi/core'; +import { Buffer, Geometry, TYPES } from '@pixi/core'; import type { IArrayBuffer } from '@pixi/core'; diff --git a/packages/mesh/src/MeshMaterial.ts b/packages/mesh/src/MeshMaterial.ts index ff96ecb231..bf65f68e38 100644 --- a/packages/mesh/src/MeshMaterial.ts +++ b/packages/mesh/src/MeshMaterial.ts @@ -1,11 +1,8 @@ -import { Program, Shader, TextureMatrix } from '@pixi/core'; -import { Matrix } from '@pixi/math'; -import { premultiplyTintToRgba } from '@pixi/utils'; +import { Matrix, utils, Program, Shader, TextureMatrix } from '@pixi/core'; import fragment from './shader/mesh.frag'; import vertex from './shader/mesh.vert'; import type { Texture } from '@pixi/core'; -import type { Dict } from '@pixi/utils'; export interface IMeshMaterialOptions { @@ -13,7 +10,7 @@ export interface IMeshMaterialOptions tint?: number; pluginName?: string; program?: Program; - uniforms?: Dict; + uniforms?: utils.Dict; } // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -157,7 +154,7 @@ export class MeshMaterial extends Shader this._colorDirty = false; const baseTexture = this.texture.baseTexture; - premultiplyTintToRgba( + utils.premultiplyTintToRgba( this._tint, this._alpha, this.uniforms.uColor, (baseTexture.alphaMode as unknown as boolean) ); } diff --git a/packages/mesh/test/Mesh.tests.ts b/packages/mesh/test/Mesh.tests.ts index c61dc44731..777706547d 100644 --- a/packages/mesh/test/Mesh.tests.ts +++ b/packages/mesh/test/Mesh.tests.ts @@ -1,9 +1,7 @@ import { Mesh, MeshGeometry, MeshMaterial } from '@pixi/mesh'; -import { skipHello } from '@pixi/utils'; +import { Texture, utils } from '@pixi/core'; -import { Texture } from '@pixi/core'; - -skipHello(); +utils.skipHello(); describe('Mesh', () => { diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 7f0ad55dc0..4efa4a4ad9 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -41,9 +41,6 @@ "peerDependencies": { "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/mixin-cache-as-bitmap/src/index.ts b/packages/mixin-cache-as-bitmap/src/index.ts index 417b1183a5..dd61c25c23 100644 --- a/packages/mixin-cache-as-bitmap/src/index.ts +++ b/packages/mixin-cache-as-bitmap/src/index.ts @@ -1,13 +1,9 @@ -import type { Renderer, MaskData, IRenderer } from '@pixi/core'; -import { Texture, BaseTexture, RenderTexture } from '@pixi/core'; +import { Texture, BaseTexture, RenderTexture, Matrix, utils, MSAA_QUALITY, settings } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; -import type { Container, IDestroyOptions } from '@pixi/display'; import { DisplayObject } from '@pixi/display'; -import type { IPointData, Rectangle } from '@pixi/math'; -import { Matrix } from '@pixi/math'; -import { uid } from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { MSAA_QUALITY } from '@pixi/constants'; + +import type { Renderer, MaskData, IRenderer, IPointData, Rectangle } from '@pixi/core'; +import type { Container, IDestroyOptions } from '@pixi/display'; // Don't import CanvasRender to remove dependency on this optional package // this type should satisify these requirements for cacheAsBitmap types @@ -288,7 +284,7 @@ DisplayObject.prototype._initCachedDisplayObject = function _initCachedDisplayOb multisample: this.cacheAsBitmapMultisample ?? renderer.multisample, }); - const textureCacheId = `cacheAsBitmap_${uid()}`; + const textureCacheId = `cacheAsBitmap_${utils.uid()}`; this._cacheData.textureCacheId = textureCacheId; @@ -399,7 +395,7 @@ DisplayObject.prototype._initCachedDisplayObjectCanvas = function _initCachedDis const renderTexture = RenderTexture.create({ width: bounds.width, height: bounds.height }); - const textureCacheId = `cacheAsBitmap_${uid()}`; + const textureCacheId = `cacheAsBitmap_${utils.uid()}`; this._cacheData.textureCacheId = textureCacheId; diff --git a/packages/mixin-cache-as-bitmap/test/cacheAsBitmap.tests.ts b/packages/mixin-cache-as-bitmap/test/cacheAsBitmap.tests.ts index a4cdf78e5c..98cc0a90fa 100644 --- a/packages/mixin-cache-as-bitmap/test/cacheAsBitmap.tests.ts +++ b/packages/mixin-cache-as-bitmap/test/cacheAsBitmap.tests.ts @@ -1,6 +1,5 @@ import { DisplayObject, Container } from '@pixi/display'; -import { Renderer, Filter } from '@pixi/core'; -import { Rectangle } from '@pixi/math'; +import { Rectangle, Renderer, Filter } from '@pixi/core'; import '@pixi/mixin-cache-as-bitmap'; diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index 6cb66bfde9..ad6bf294db 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -39,7 +39,7 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2" + "@pixi/core": "6.5.2", + "@pixi/display": "6.5.2" } } diff --git a/packages/mixin-get-global-position/src/index.ts b/packages/mixin-get-global-position/src/index.ts index 50a2e6d326..bc2725c92e 100644 --- a/packages/mixin-get-global-position/src/index.ts +++ b/packages/mixin-get-global-position/src/index.ts @@ -1,5 +1,5 @@ import { DisplayObject } from '@pixi/display'; -import { Point } from '@pixi/math'; +import { Point } from '@pixi/core'; /** * Returns the global position of the displayObject. Does not depend on object scale, rotation and pivot. diff --git a/packages/particle-container/package.json b/packages/particle-container/package.json index 71de9b5bb3..ca38b0b0a5 100644 --- a/packages/particle-container/package.json +++ b/packages/particle-container/package.json @@ -38,11 +38,8 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/particle-container/src/ParticleBuffer.ts b/packages/particle-container/src/ParticleBuffer.ts index 6047f7f2f7..4035f4dc9f 100644 --- a/packages/particle-container/src/ParticleBuffer.ts +++ b/packages/particle-container/src/ParticleBuffer.ts @@ -1,6 +1,4 @@ -import { createIndicesForQuads } from '@pixi/utils'; -import { Geometry, Buffer } from '@pixi/core'; -import { TYPES } from '@pixi/constants'; +import { Geometry, Buffer, TYPES, utils } from '@pixi/core'; import type { Sprite } from '@pixi/sprite'; import type { IParticleRendererProperty } from './ParticleRenderer'; @@ -108,7 +106,7 @@ export class ParticleBuffer let dynamicOffset = 0; - this.indexBuffer = new Buffer(createIndicesForQuads(this.size), true, true); + this.indexBuffer = new Buffer(utils.createIndicesForQuads(this.size), true, true); geometry.addIndex(this.indexBuffer); this.dynamicStride = 0; diff --git a/packages/particle-container/src/ParticleContainer.ts b/packages/particle-container/src/ParticleContainer.ts index dc0564c170..27fd021964 100644 --- a/packages/particle-container/src/ParticleContainer.ts +++ b/packages/particle-container/src/ParticleContainer.ts @@ -1,6 +1,5 @@ -import { BLEND_MODES } from '@pixi/constants'; +import { BLEND_MODES, utils } from '@pixi/core'; import { Container } from '@pixi/display'; -import { hex2rgb } from '@pixi/utils'; import type { BaseTexture, Renderer } from '@pixi/core'; import type { ParticleBuffer } from './ParticleBuffer'; @@ -193,7 +192,7 @@ export class ParticleContainer extends Container set tint(value: number) { this._tint = value; - hex2rgb(value, this.tintRgb); + utils.hex2rgb(value, this.tintRgb); } /** diff --git a/packages/particle-container/src/ParticleRenderer.ts b/packages/particle-container/src/ParticleRenderer.ts index 965e3ffdc0..46e9bb2a2a 100644 --- a/packages/particle-container/src/ParticleRenderer.ts +++ b/packages/particle-container/src/ParticleRenderer.ts @@ -1,7 +1,4 @@ -import { TYPES } from '@pixi/constants'; -import { extensions, ExtensionType, ObjectRenderer, Shader, State } from '@pixi/core'; -import { Matrix } from '@pixi/math'; -import { correctBlendMode, premultiplyRgba, premultiplyTint } from '@pixi/utils'; +import { TYPES, Matrix, extensions, ExtensionType, ObjectRenderer, Shader, State, utils } from '@pixi/core'; import { ParticleBuffer } from './ParticleBuffer'; import fragment from './particles.frag'; import vertex from './particles.vert'; @@ -145,7 +142,7 @@ export class ParticleRenderer extends ObjectRenderer const premultiplied = baseTexture.alphaMode > 0; // if the uvs have not updated then no point rendering just yet! - this.state.blendMode = correctBlendMode(container.blendMode, premultiplied); + this.state.blendMode = utils.correctBlendMode(container.blendMode, premultiplied); renderer.state.set(this.state); const gl = renderer.gl; @@ -156,7 +153,7 @@ export class ParticleRenderer extends ObjectRenderer this.shader.uniforms.translationMatrix = m.toArray(true); - this.shader.uniforms.uColor = premultiplyRgba(container.tintRgb, + this.shader.uniforms.uColor = utils.premultiplyRgba(container.tintRgb, container.worldAlpha, this.shader.uniforms.uColor, premultiplied); this.shader.uniforms.uSampler = baseTexture; @@ -434,7 +431,7 @@ export class ParticleRenderer extends ObjectRenderer // we dont call extra function if alpha is 1.0, that's faster const argb = alpha < 1.0 && premultiplied - ? premultiplyTint(sprite._tintRGB, alpha) : sprite._tintRGB + (alpha * 255 << 24); + ? utils.premultiplyTint(sprite._tintRGB, alpha) : sprite._tintRGB + (alpha * 255 << 24); array[offset] = argb; array[offset + stride] = argb; diff --git a/packages/particle-container/test/ParticleRenderer.tests.ts b/packages/particle-container/test/ParticleRenderer.tests.ts index 05714da2c7..7e74e0e775 100644 --- a/packages/particle-container/test/ParticleRenderer.tests.ts +++ b/packages/particle-container/test/ParticleRenderer.tests.ts @@ -1,11 +1,10 @@ import { ParticleContainer } from '@pixi/particle-container'; -import { Texture, Renderer } from '@pixi/core'; -import { skipHello } from '@pixi/utils'; +import { Texture, Renderer, utils } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; import path from 'path'; -skipHello(); +utils.skipHello(); describe('ParticleRenderer', () => { diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 17c2d90840..54dbce44f7 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -41,9 +41,6 @@ "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", "@pixi/graphics": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/text": "6.5.2", - "@pixi/ticker": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text": "6.5.2" } } diff --git a/packages/prepare/src/BasePrepare.ts b/packages/prepare/src/BasePrepare.ts index bdbf17e2ab..1a272de9e3 100644 --- a/packages/prepare/src/BasePrepare.ts +++ b/packages/prepare/src/BasePrepare.ts @@ -1,6 +1,4 @@ -import { Texture, BaseTexture } from '@pixi/core'; -import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; -import { settings } from '@pixi/settings'; +import { Ticker, UPDATE_PRIORITY, settings, Texture, BaseTexture } from '@pixi/core'; import type { DisplayObject } from '@pixi/display'; import { Container } from '@pixi/display'; import { Text, TextStyle, TextMetrics } from '@pixi/text'; diff --git a/packages/prepare/src/settings.ts b/packages/prepare/src/settings.ts index 3f5b9186e8..f472565053 100644 --- a/packages/prepare/src/settings.ts +++ b/packages/prepare/src/settings.ts @@ -1,4 +1,4 @@ -import { settings } from '@pixi/settings'; +import { settings } from '@pixi/core'; /** * Default number of uploads per frame using prepare plugin. diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index a414942aa9..3ebae3b492 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -39,7 +39,6 @@ ], "peerDependencies": { "@pixi/core": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/ticker": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/sprite-animated/src/AnimatedSprite.ts b/packages/sprite-animated/src/AnimatedSprite.ts index 79f646852a..8038ed2ae6 100644 --- a/packages/sprite-animated/src/AnimatedSprite.ts +++ b/packages/sprite-animated/src/AnimatedSprite.ts @@ -1,6 +1,5 @@ -import { Texture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; -import { Ticker, UPDATE_PRIORITY } from '@pixi/ticker'; +import { Texture, Ticker, UPDATE_PRIORITY } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; /** diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index fff3bf09f5..211077b3a8 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -38,11 +38,8 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/sprite-tiling/src/TilingSprite.ts b/packages/sprite-tiling/src/TilingSprite.ts index d2af957c47..6368723e83 100644 --- a/packages/sprite-tiling/src/TilingSprite.ts +++ b/packages/sprite-tiling/src/TilingSprite.ts @@ -1,9 +1,7 @@ -import { Texture, TextureMatrix } from '@pixi/core'; -import { Point, Rectangle, Transform } from '@pixi/math'; +import { Point, Rectangle, Transform, Texture, TextureMatrix } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; -import type { Renderer, IBaseTextureOptions, TextureSource } from '@pixi/core'; +import type { IPoint, IPointData, ISize, ObservablePoint, Renderer, IBaseTextureOptions, TextureSource } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; -import type { IPoint, IPointData, ISize, ObservablePoint } from '@pixi/math'; const tempPoint = new Point(); diff --git a/packages/sprite-tiling/src/TilingSpriteRenderer.ts b/packages/sprite-tiling/src/TilingSpriteRenderer.ts index 5e4c2715e6..da8bb16d18 100644 --- a/packages/sprite-tiling/src/TilingSpriteRenderer.ts +++ b/packages/sprite-tiling/src/TilingSpriteRenderer.ts @@ -1,7 +1,4 @@ -import { ObjectRenderer, Shader, State, QuadUv, ExtensionType } from '@pixi/core'; -import { WRAP_MODES } from '@pixi/constants'; -import { Matrix } from '@pixi/math'; -import { premultiplyTintToRgba, correctBlendMode } from '@pixi/utils'; +import { ObjectRenderer, Shader, State, QuadUv, ExtensionType, WRAP_MODES, Matrix, utils } from '@pixi/core'; import fragmentSimpleSrc from './sprite-tiling-simple.frag'; import gl1VertexSrc from './sprite-tiling-fallback.vert'; @@ -152,7 +149,7 @@ export class TilingSpriteRenderer extends ObjectRenderer } shader.uniforms.uTransform = tempMat.toArray(true); - shader.uniforms.uColor = premultiplyTintToRgba(ts.tint, ts.worldAlpha, + shader.uniforms.uColor = utils.premultiplyTintToRgba(ts.tint, ts.worldAlpha, shader.uniforms.uColor, premultiplied); shader.uniforms.translationMatrix = ts.transform.worldTransform.toArray(true); shader.uniforms.uSampler = tex; @@ -160,7 +157,7 @@ export class TilingSpriteRenderer extends ObjectRenderer renderer.shader.bind(shader); renderer.geometry.bind(quad); - this.state.blendMode = correctBlendMode(ts.blendMode, premultiplied); + this.state.blendMode = utils.correctBlendMode(ts.blendMode, premultiplied); renderer.state.set(this.state); renderer.geometry.draw(this.renderer.gl.TRIANGLES, 6, 0); } diff --git a/packages/sprite-tiling/test/TilingSprite.tests.ts b/packages/sprite-tiling/test/TilingSprite.tests.ts index 57a7cb8ebb..0ac7227147 100644 --- a/packages/sprite-tiling/test/TilingSprite.tests.ts +++ b/packages/sprite-tiling/test/TilingSprite.tests.ts @@ -1,7 +1,6 @@ import type { Bounds } from '@pixi/display'; import { Container } from '@pixi/display'; -import { Texture, BaseTexture } from '@pixi/core'; -import { Point, Rectangle } from '@pixi/math'; +import { Point, Rectangle, Texture, BaseTexture } from '@pixi/core'; import { Sprite } from '@pixi/sprite'; import { TilingSprite } from '@pixi/sprite-tiling'; diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 9e32c23c44..8accfc37d9 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -38,11 +38,7 @@ "*.d.ts" ], "peerDependencies": { - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", - "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/display": "6.5.2" } } diff --git a/packages/sprite/src/Sprite.ts b/packages/sprite/src/Sprite.ts index 2b6050e062..886688e7a9 100644 --- a/packages/sprite/src/Sprite.ts +++ b/packages/sprite/src/Sprite.ts @@ -1,13 +1,8 @@ -import { BLEND_MODES } from '@pixi/constants'; -import { Texture } from '@pixi/core'; import { Bounds, Container } from '@pixi/display'; -import { ObservablePoint, Point, Rectangle } from '@pixi/math'; -import { settings } from '@pixi/settings'; -import { sign } from '@pixi/utils'; +import { BLEND_MODES, Texture, settings, utils, ObservablePoint, Point, Rectangle } from '@pixi/core'; -import type { IBaseTextureOptions, Renderer, TextureSource } from '@pixi/core'; +import type { IPointData, IBaseTextureOptions, Renderer, TextureSource } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; -import type { IPointData } from '@pixi/math'; const tempPoint = new Point(); const indices = new Uint16Array([0, 1, 2, 0, 2, 3]); @@ -200,12 +195,12 @@ export class Sprite extends Container // so if _width is 0 then width was not set.. if (this._width) { - this.scale.x = sign(this.scale.x) * this._width / this._texture.orig.width; + this.scale.x = utils.sign(this.scale.x) * this._width / this._texture.orig.width; } if (this._height) { - this.scale.y = sign(this.scale.y) * this._height / this._texture.orig.height; + this.scale.y = utils.sign(this.scale.y) * this._height / this._texture.orig.height; } } @@ -532,7 +527,7 @@ export class Sprite extends Container set width(value: number) { - const s = sign(this.scale.x) || 1; + const s = utils.sign(this.scale.x) || 1; this.scale.x = s * value / this._texture.orig.width; this._width = value; @@ -546,7 +541,7 @@ export class Sprite extends Container set height(value: number) { - const s = sign(this.scale.y) || 1; + const s = utils.sign(this.scale.y) || 1; this.scale.y = s * value / this._texture.orig.height; this._height = value; diff --git a/packages/sprite/test/Sprite.tests.ts b/packages/sprite/test/Sprite.tests.ts index 5f55adaf16..7e32acf78f 100755 --- a/packages/sprite/test/Sprite.tests.ts +++ b/packages/sprite/test/Sprite.tests.ts @@ -1,7 +1,6 @@ import { Sprite } from '@pixi/sprite'; -import { Texture, BaseTexture, RenderTexture } from '@pixi/core'; +import { Point, Texture, BaseTexture, RenderTexture } from '@pixi/core'; import { Container } from '@pixi/display'; -import { Point } from '@pixi/math'; import path from 'path'; diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 1b77710428..fe5b56a7f6 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -39,8 +39,6 @@ ], "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/core": "6.5.2" } } diff --git a/packages/spritesheet/src/Spritesheet.ts b/packages/spritesheet/src/Spritesheet.ts index 2ad3a12bb4..860dd7f7d3 100644 --- a/packages/spritesheet/src/Spritesheet.ts +++ b/packages/spritesheet/src/Spritesheet.ts @@ -1,9 +1,5 @@ -import { Rectangle } from '@pixi/math'; -import { Texture, BaseTexture } from '@pixi/core'; -import { getResolutionOfUrl } from '@pixi/utils'; -import type { Dict } from '@pixi/utils'; -import type { ImageResource } from '@pixi/core'; -import type { IPointData } from '@pixi/math'; +import { Texture, BaseTexture, utils, Rectangle } from '@pixi/core'; +import type { ImageResource, IPointData } from '@pixi/core'; /** Represents the JSON data for a spritesheet atlas. */ export interface ISpritesheetFrameData @@ -30,8 +26,8 @@ export interface ISpritesheetFrameData /** Atlas format. */ export interface ISpritesheetData { - frames: Dict; - animations?: Dict; + frames: utils.Dict; + animations?: utils.Dict; meta: { scale: string; // eslint-disable-next-line camelcase @@ -87,7 +83,7 @@ export class Spritesheet * new PIXI.Sprite(sheet.textures["image.png"]); * ``` */ - public textures: Dict; + public textures: utils.Dict; /** * A map containing the textures for each animation. @@ -96,7 +92,7 @@ export class Spritesheet * new PIXI.AnimatedSprite(sheet.animations["anim_name"]) * ``` */ - public animations: Dict; + public animations: utils.Dict; /** * Reference to the original JSON data. @@ -117,7 +113,7 @@ export class Spritesheet * Map of spritesheet frames. * @type {object} */ - private _frames: Dict; + private _frames: utils.Dict; /** Collection of frame names. */ private _frameKeys: string[]; @@ -129,7 +125,7 @@ export class Spritesheet * Callback when parse is completed. * @type {Function} */ - private _callback: (textures: Dict) => void; + private _callback: (textures: utils.Dict) => void; /** * @param texture - Reference to the source BaseTexture object. @@ -167,7 +163,7 @@ export class Spritesheet const { scale } = this.data.meta; // Use a defaultValue of `null` to check if a url-based resolution is set - let resolution = getResolutionOfUrl(resolutionFilename, null); + let resolution = utils.getResolutionOfUrl(resolutionFilename, null); // No resolution found via URL if (resolution === null) @@ -190,7 +186,7 @@ export class Spritesheet * to prevent creating too many Texture within a single process. * @method PIXI.Spritesheet#parse */ - public parse(): Promise> + public parse(): Promise> { return new Promise((resolve) => { diff --git a/packages/spritesheet/src/cacheSpritesheet.ts b/packages/spritesheet/src/cacheSpritesheet.ts index 6d66551a0c..995ba3caf1 100644 --- a/packages/spritesheet/src/cacheSpritesheet.ts +++ b/packages/spritesheet/src/cacheSpritesheet.ts @@ -1,6 +1,5 @@ -import { extensions, ExtensionType } from '@pixi/core'; +import { extensions, ExtensionType, utils } from '@pixi/core'; import { Spritesheet } from './Spritesheet'; -import { path } from '@pixi/utils'; import type { CacheParser } from '@pixi/assets'; function getCacheableAssets(keys: string[], asset: Spritesheet, ignoreMultiPack: boolean) @@ -19,7 +18,7 @@ function getCacheableAssets(keys: string[], asset: Spritesheet, ignoreMultiPack: if (!ignoreMultiPack) { - const basePath = path.dirname(keys[0]); + const basePath = utils.path.dirname(keys[0]); asset.linkedSheets.forEach((item: Spritesheet, i) => { diff --git a/packages/spritesheet/src/loadSpritesheet.ts b/packages/spritesheet/src/loadSpritesheet.ts index 227e764c86..a9f04c09f4 100644 --- a/packages/spritesheet/src/loadSpritesheet.ts +++ b/packages/spritesheet/src/loadSpritesheet.ts @@ -1,8 +1,7 @@ import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; import { LoaderParserPriority } from '@pixi/assets'; import type { Texture } from '@pixi/core'; -import { extensions, ExtensionType } from '@pixi/core'; -import { path } from '@pixi/utils'; +import { extensions, ExtensionType, utils } from '@pixi/core'; import type { ISpritesheetData } from './Spritesheet'; import { Spritesheet } from './Spritesheet'; @@ -30,12 +29,12 @@ export const loadSpritesheet = { async testParse(asset: SpriteSheetJson, options: LoadAsset): Promise { - return (path.extname(options.src).includes('.json') && !!asset.frames); + return (utils.path.extname(options.src).includes('.json') && !!asset.frames); }, async parse(asset: SpriteSheetJson, options: LoadAsset, loader: Loader): Promise { - let basePath = path.dirname(options.src); + let basePath = utils.path.dirname(options.src); if (basePath && basePath.lastIndexOf('/') !== (basePath.length - 1)) { diff --git a/packages/spritesheet/src/resolveSpriteSheetUrl.ts b/packages/spritesheet/src/resolveSpriteSheetUrl.ts index f5d0dbf879..576c27cd07 100644 --- a/packages/spritesheet/src/resolveSpriteSheetUrl.ts +++ b/packages/spritesheet/src/resolveSpriteSheetUrl.ts @@ -1,5 +1,4 @@ -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; +import { settings, extensions, ExtensionType } from '@pixi/core'; import type { ResolveAsset, ResolveURLParser } from '@pixi/assets'; const validImages = ['jpg', 'png', 'jpeg', 'avif', 'webp']; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 710d5817a4..a5762c4966 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -39,13 +39,9 @@ ], "peerDependencies": { "@pixi/assets": "6.5.2", - "@pixi/constants": "6.5.2", "@pixi/core": "6.5.2", "@pixi/display": "6.5.2", - "@pixi/math": "6.5.2", "@pixi/mesh": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/text": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/text": "6.5.2" } } diff --git a/packages/text-bitmap/src/BitmapFont.ts b/packages/text-bitmap/src/BitmapFont.ts index d8ad917f9f..f3198870b7 100644 --- a/packages/text-bitmap/src/BitmapFont.ts +++ b/packages/text-bitmap/src/BitmapFont.ts @@ -1,15 +1,10 @@ -import { getResolutionOfUrl } from '@pixi/utils'; -import { Rectangle } from '@pixi/math'; -import { Texture, BaseTexture } from '@pixi/core'; +import { ALPHA_MODES, settings, Texture, BaseTexture, Rectangle, utils } from '@pixi/core'; import { TextStyle, TextMetrics } from '@pixi/text'; import { autoDetectFormat } from './formats'; import { BitmapFontData } from './BitmapFontData'; import { resolveCharacters, drawGlyph, extractCharCode } from './utils'; -import type { Dict } from '@pixi/utils'; import type { ITextStyle } from '@pixi/text'; -import { ALPHA_MODES } from '@pixi/constants'; -import { settings } from '@pixi/settings'; export interface IBitmapFontCharacter { @@ -18,7 +13,7 @@ export interface IBitmapFontCharacter xAdvance: number; texture: Texture; page: number; - kerning: Dict; + kerning: utils.Dict; } /** @memberof PIXI */ @@ -108,7 +103,7 @@ export class BitmapFont }; /** Collection of available/installed fonts. */ - public static readonly available: Dict = {}; + public static readonly available: utils.Dict = {}; /** The name of the font face. */ public readonly font: string; @@ -120,10 +115,10 @@ export class BitmapFont public readonly lineHeight: number; /** The map of characters by character code. */ - public readonly chars: Dict; + public readonly chars: utils.Dict; /** The map of base page textures (i.e., sheets of glyphs). */ - public readonly pageTextures: Dict; + public readonly pageTextures: utils.Dict; /** The range of the distance field in pixels. */ public readonly distanceFieldRange: number; @@ -139,14 +134,14 @@ export class BitmapFont * @param ownsTextures - Setting to `true` will destroy page textures * when the font is uninstalled. */ - constructor(data: BitmapFontData, textures: Texture[] | Dict, ownsTextures?: boolean) + constructor(data: BitmapFontData, textures: Texture[] | utils.Dict, ownsTextures?: boolean) { const [info] = data.info; const [common] = data.common; const [page] = data.page; const [distanceField] = data.distanceField; - const res = getResolutionOfUrl(page.file); - const pageTextures: Dict = {}; + const res = utils.getResolutionOfUrl(page.file); + const pageTextures: utils.Dict = {}; this._ownsTextures = ownsTextures; this.font = info.face; @@ -262,7 +257,7 @@ export class BitmapFont */ public static install( data: string | XMLDocument | BitmapFontData, - textures: Texture | Texture[] | Dict, + textures: Texture | Texture[] | utils.Dict, ownsTextures?: boolean ): BitmapFont { diff --git a/packages/text-bitmap/src/BitmapText.ts b/packages/text-bitmap/src/BitmapText.ts index bab4e1f833..7101961924 100644 --- a/packages/text-bitmap/src/BitmapText.ts +++ b/packages/text-bitmap/src/BitmapText.ts @@ -1,19 +1,14 @@ -import { ObservablePoint, Point } from '@pixi/math'; -import { settings } from '@pixi/settings'; import { Mesh, MeshGeometry, MeshMaterial } from '@pixi/mesh'; -import { removeItems } from '@pixi/utils'; import { BitmapFont } from './BitmapFont'; import { splitTextToCharacters, extractCharCode } from './utils'; import msdfFrag from './shader/msdf.frag'; import msdfVert from './shader/msdf.vert'; -import type { Rectangle } from '@pixi/math'; -import type { Renderer } from '@pixi/core'; -import { Program, Texture } from '@pixi/core'; +import type { Renderer, Rectangle } from '@pixi/core'; +import { Program, Texture, BLEND_MODES, settings, utils, ObservablePoint, Point } from '@pixi/core'; import type { IBitmapTextStyle } from './BitmapTextStyle'; import type { TextStyleAlign } from '@pixi/text'; import { Container } from '@pixi/display'; import type { IDestroyOptions } from '@pixi/display'; -import { BLEND_MODES } from '@pixi/constants'; interface PageMeshData { @@ -309,7 +304,7 @@ export class BitmapText extends Container if (lastBreakPos !== -1 && maxWidth > 0 && pos.x > maxWidth) { ++spacesRemoved; - removeItems(chars, 1 + lastBreakPos - spacesRemoved, 1 + i - lastBreakPos); + utils.removeItems(chars, 1 + lastBreakPos - spacesRemoved, 1 + i - lastBreakPos); i = lastBreakPos; lastBreakPos = -1; diff --git a/packages/text-bitmap/src/loadBitmapFont.ts b/packages/text-bitmap/src/loadBitmapFont.ts index 5810d37922..9ae1d0996c 100644 --- a/packages/text-bitmap/src/loadBitmapFont.ts +++ b/packages/text-bitmap/src/loadBitmapFont.ts @@ -1,7 +1,5 @@ import type { Texture } from '@pixi/core'; -import { extensions, ExtensionType } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { path } from '@pixi/utils'; +import { settings, utils, extensions, ExtensionType } from '@pixi/core'; import type { LoadAsset, Loader, LoaderParser } from '@pixi/assets'; import { LoaderParserPriority } from '@pixi/assets'; @@ -20,7 +18,7 @@ export const loadBitmapFont = { test(url: string): boolean { - return validExtensions.includes(path.extname(url)); + return validExtensions.includes(utils.path.extname(url)); }, async testParse(data: string): Promise @@ -41,7 +39,7 @@ export const loadBitmapFont = { for (let i = 0; i < pages.length; ++i) { const pageFile = pages[i].file; - const imagePath = path.join(path.dirname(src), pageFile); + const imagePath = utils.path.join(utils.path.dirname(src), pageFile); textureUrls.push(imagePath); } diff --git a/packages/text-bitmap/src/utils/drawGlyph.ts b/packages/text-bitmap/src/utils/drawGlyph.ts index 43b0ac40d4..3f841dbaae 100644 --- a/packages/text-bitmap/src/utils/drawGlyph.ts +++ b/packages/text-bitmap/src/utils/drawGlyph.ts @@ -1,5 +1,5 @@ import { generateFillStyle } from './generateFillStyle'; -import { hex2rgb, string2hex } from '@pixi/utils'; +import { utils } from '@pixi/core'; import type { TextMetrics, TextStyle } from '@pixi/text'; // TODO: Prevent code duplication b/w drawGlyph & Text#updateText @@ -49,7 +49,7 @@ export function drawGlyph( if (style.dropShadow) { const dropShadowColor = style.dropShadowColor; - const rgb = hex2rgb(typeof dropShadowColor === 'number' ? dropShadowColor : string2hex(dropShadowColor)); + const rgb = utils.hex2rgb(typeof dropShadowColor === 'number' ? dropShadowColor : utils.string2hex(dropShadowColor)); const dropShadowBlur = style.dropShadowBlur * resolution; const dropShadowDistance = style.dropShadowDistance * resolution; diff --git a/packages/text-bitmap/test/BitmapText.tests.ts b/packages/text-bitmap/test/BitmapText.tests.ts index f6c178a906..0366048905 100644 --- a/packages/text-bitmap/test/BitmapText.tests.ts +++ b/packages/text-bitmap/test/BitmapText.tests.ts @@ -1,8 +1,7 @@ import path from 'path'; import fs from 'fs'; import { BitmapText, BitmapFont } from '@pixi/text-bitmap'; -import { settings } from '@pixi/settings'; -import { Texture, Renderer } from '@pixi/core'; +import { settings, Texture, Renderer } from '@pixi/core'; import type { Container } from '@pixi/display'; diff --git a/packages/text/package.json b/packages/text/package.json index ad73aa85e4..b2de44c1ca 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -39,9 +39,6 @@ ], "peerDependencies": { "@pixi/core": "6.5.2", - "@pixi/math": "6.5.2", - "@pixi/settings": "6.5.2", - "@pixi/sprite": "6.5.2", - "@pixi/utils": "6.5.2" + "@pixi/sprite": "6.5.2" } } diff --git a/packages/text/src/Text.ts b/packages/text/src/Text.ts index 5c00f6f711..4d69a5e65f 100644 --- a/packages/text/src/Text.ts +++ b/packages/text/src/Text.ts @@ -1,9 +1,6 @@ /* eslint max-depth: [2, 8] */ import { Sprite } from '@pixi/sprite'; -import { Texture } from '@pixi/core'; -import { settings } from '@pixi/settings'; -import { Rectangle } from '@pixi/math'; -import { sign, trimCanvas, hex2rgb, string2hex } from '@pixi/utils'; +import { Texture, settings, Rectangle, utils } from '@pixi/core'; import { TEXT_GRADIENT } from './const'; import { TextStyle } from './TextStyle'; import { TextMetrics } from './TextMetrics'; @@ -229,7 +226,9 @@ export class Text extends Sprite context.strokeStyle = 'black'; const dropShadowColor = style.dropShadowColor; - const rgb = hex2rgb(typeof dropShadowColor === 'number' ? dropShadowColor : string2hex(dropShadowColor)); + const rgb = utils.hex2rgb(typeof dropShadowColor === 'number' + ? dropShadowColor + : utils.string2hex(dropShadowColor)); const dropShadowBlur = style.dropShadowBlur * this._resolution; const dropShadowDistance = style.dropShadowDistance * this._resolution; @@ -386,7 +385,7 @@ export class Text extends Sprite if (this._style.trim) { - const trimmed = trimCanvas(canvas); + const trimmed = utils.trimCanvas(canvas); if (trimmed.data) { @@ -677,7 +676,7 @@ export class Text extends Sprite { this.updateText(true); - const s = sign(this.scale.x) || 1; + const s = utils.sign(this.scale.x) || 1; this.scale.x = s * value / this._texture.orig.width; this._width = value; @@ -695,7 +694,7 @@ export class Text extends Sprite { this.updateText(true); - const s = sign(this.scale.y) || 1; + const s = utils.sign(this.scale.y) || 1; this.scale.y = s * value / this._texture.orig.height; this._height = value; diff --git a/packages/text/src/TextMetrics.ts b/packages/text/src/TextMetrics.ts index 144edbaac3..e582fddfa4 100644 --- a/packages/text/src/TextMetrics.ts +++ b/packages/text/src/TextMetrics.ts @@ -1,4 +1,4 @@ -import { settings } from '@pixi/settings'; +import { settings } from '@pixi/core'; import type { TextStyle, TextStyleWhiteSpace } from './TextStyle'; interface IFontMetrics diff --git a/packages/text/src/TextStyle.ts b/packages/text/src/TextStyle.ts index 59d38526c9..ce746bb4ac 100644 --- a/packages/text/src/TextStyle.ts +++ b/packages/text/src/TextStyle.ts @@ -2,7 +2,7 @@ /* eslint-disable */ import { TEXT_GRADIENT } from './const'; -import { hex2string } from '@pixi/utils'; +import { utils } from '@pixi/core'; export type TextStyleAlign = 'left'|'center'|'right'|'justify'; export type TextStyleFill = string|string[]|number|number[]|CanvasGradient|CanvasPattern; @@ -740,7 +740,7 @@ function getSingleColor(color: string|number): string { if (typeof color === 'number') { - return hex2string(color); + return utils.hex2string(color); } else if (typeof color === 'string') { diff --git a/packages/text/test/Text.tests.ts b/packages/text/test/Text.tests.ts index e04bfc8a06..102ee72f3d 100644 --- a/packages/text/test/Text.tests.ts +++ b/packages/text/test/Text.tests.ts @@ -1,11 +1,9 @@ import { Text } from '@pixi/text'; import { Sprite } from '@pixi/sprite'; -import { skipHello } from '@pixi/utils'; -import { settings } from '@pixi/settings'; -import { Renderer } from '@pixi/core'; +import { settings, Renderer, utils } from '@pixi/core'; import type { IDestroyOptions } from '@pixi/display'; -skipHello(); +utils.skipHello(); describe('Text', () => { diff --git a/packages/ticker/package.json b/packages/ticker/package.json index ad79ba22cf..42b64d9286 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -37,7 +37,7 @@ "dist", "*.d.ts" ], - "peerDependencies": { + "dependencies": { "@pixi/extensions": "6.5.2", "@pixi/settings": "6.5.2" } diff --git a/packages/ticker/src/TickerPlugin.ts b/packages/ticker/src/TickerPlugin.ts index 3daff9ea0f..407765d95f 100644 --- a/packages/ticker/src/TickerPlugin.ts +++ b/packages/ticker/src/TickerPlugin.ts @@ -5,11 +5,6 @@ import { Ticker } from './Ticker'; /** * Middleware for for Application Ticker. - * @example - * import {TickerPlugin} from '@pixi/ticker'; - * import {Application} from '@pixi/app'; - * import {extensions} from '@pixi/extensions'; - * extensions.add(TickerPlugin); * @class * @memberof PIXI */ diff --git a/packages/utils/package.json b/packages/utils/package.json index d1014c3b46..613b51a01a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -39,15 +39,13 @@ "*.d.ts" ], "dependencies": { + "@pixi/constants": "6.5.2", + "@pixi/settings": "6.5.2", "@types/earcut": "^2.1.0", "earcut": "^2.2.4", "eventemitter3": "^3.1.0", "url": "^0.11.0" }, - "peerDependencies": { - "@pixi/constants": "6.5.2", - "@pixi/settings": "6.5.2" - }, "devDependencies": { "css-color-names": "^1.0.1" }